diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:41:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:41:16 -0400 |
| commit | b4d3de8ca25fcdf697da38d9f9785cb508edea4d (patch) | |
| tree | 8d2940fab556b05f4f1c7980c611211ffaa0f025 /drivers/net/wireless/ath/ath9k/hw.h | |
| parent | 3857e3ee2209b7289c434103e366f765ec82a22d (diff) | |
| parent | 2fa8b6a0e42570690a48a56cb65778211e3cc9cc (diff) | |
| download | linux-b4d3de8ca25fcdf697da38d9f9785cb508edea4d.tar.bz2 | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 3aa3fb191775..c8af86c795e5 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h @@ -623,7 +623,7 @@ struct ath_hw_ops { struct ath_tx_status *ts); void (*set11n_txdesc)(struct ath_hw *ah, void *ds, u32 pktLen, enum ath9k_pkt_type type, - u32 txPower, u32 keyIx, + u32 txPower, u8 keyIx, enum ath9k_key_type keyType, u32 flags); void (*set11n_ratescenario)(struct ath_hw *ah, void *ds, |