package/mac80211/patches/540-ath9k_txkeyidx_u8.patch

   1 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
   2 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
   3 @@ -273,7 +273,7 @@ static int ar9002_hw_proc_txdesc(struct
   4
   5  static void ar9002_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
   6                                     u32 pktLen, enum ath9k_pkt_type type,
   7 -                                   u32 txPower, u32 keyIx,
   8 +                                   u32 txPower, u8 keyIx,
   9                                     enum ath9k_key_type keyType, u32 flags)
  10  {
  11         struct ar5416_desc *ads = AR5416DESC(ds);
  12 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
  13 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
  14 @@ -207,8 +207,8 @@ struct ath_atx_ac {
  15
  16  struct ath_frame_info {
  17         int framelen;
  18 -       u32 keyix;
  19         enum ath9k_key_type keytype;
  20 +       u8 keyix;
  21         u8 retries;
  22         u16 seqno;
  23  };
  24 --- a/drivers/net/wireless/ath/ath9k/hw.h
  25 +++ b/drivers/net/wireless/ath/ath9k/hw.h
  26 @@ -623,7 +623,7 @@ struct ath_hw_ops {
  27                            struct ath_tx_status *ts);
  28         void (*set11n_txdesc)(struct ath_hw *ah, void *ds,
  29                               u32 pktLen, enum ath9k_pkt_type type,
  30 -                             u32 txPower, u32 keyIx,
  31 +                             u32 txPower, u8 keyIx,
  32                               enum ath9k_key_type keyType,
  33                               u32 flags);
  34         void (*set11n_ratescenario)(struct ath_hw *ah, void *ds,
  35 --- a/drivers/net/wireless/ath/ath9k/mac.h
  36 +++ b/drivers/net/wireless/ath/ath9k/mac.h
  37 @@ -194,7 +194,7 @@ struct ath_htc_rx_status {
  38  #define ATH9K_RX_DECRYPT_BUSY     0x40
  39
  40  #define ATH9K_RXKEYIX_INVALID  ((u8)-1)
  41 -#define ATH9K_TXKEYIX_INVALID  ((u32)-1)
  42 +#define ATH9K_TXKEYIX_INVALID  ((u8)-1)
  43
  44  enum ath9k_phyerr {
  45         ATH9K_PHYERR_UNDERRUN             = 0,  /* Transmit underrun */
  46 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
  47 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
  48 @@ -312,7 +312,7 @@ static int ar9003_hw_proc_txdesc(struct
  49
  50  static void ar9003_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
  51                 u32 pktlen, enum ath9k_pkt_type type, u32 txpower,
  52 -               u32 keyIx, enum ath9k_key_type keyType, u32 flags)
  53 +               u8 keyIx, enum ath9k_key_type keyType, u32 flags)
  54  {
  55         struct ar9003_txc *ads = (struct ar9003_txc *) ds;
  56