ath9k: make the regulatory override less intrusive - allow it to parse CTLs
[openwrt.git] / package / mac80211 / patches / 556-ath9k_desc_alignment.patch
1 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
2 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
3 @@ -65,7 +65,7 @@ struct ar9003_rxs {
4         u32 status9;
5         u32 status10;
6         u32 status11;
7 -} __packed;
8 +} __packed __aligned(4);
9  
10  /* Transmit Control Descriptor */
11  struct ar9003_txc {
12 @@ -93,7 +93,7 @@ struct ar9003_txc {
13         u32 ctl21;  /* DMA control 21 */
14         u32 ctl22;  /* DMA control 22 */
15         u32 pad[9]; /* pad to cache line (128 bytes/32 dwords) */
16 -} __packed;
17 +} __packed __aligned(4);
18  
19  struct ar9003_txs {
20         u32 ds_info;
21 @@ -105,7 +105,7 @@ struct ar9003_txs {
22         u32 status6;
23         u32 status7;
24         u32 status8;
25 -} __packed;
26 +} __packed __aligned(4);
27  
28  void ar9003_hw_attach_mac_ops(struct ath_hw *hw);
29  void ath9k_hw_set_rx_bufsize(struct ath_hw *ah, u16 buf_size);
30 --- a/drivers/net/wireless/ath/ath9k/mac.h
31 +++ b/drivers/net/wireless/ath/ath9k/mac.h
32 @@ -237,7 +237,7 @@ struct ath_desc {
33         u32 ds_ctl1;
34         u32 ds_hw[20];
35         void *ds_vdata;
36 -} __packed;
37 +} __packed __aligned(4);
38  
39  #define ATH9K_TXDESC_CLRDMASK          0x0001
40  #define ATH9K_TXDESC_NOACK             0x0002
41 @@ -307,7 +307,7 @@ struct ar5416_desc {
42                         u32 status8;
43                 } rx;
44         } u;
45 -} __packed;
46 +} __packed __aligned(4);
47  
48  #define AR5416DESC(_ds)         ((struct ar5416_desc *)(_ds))
49  #define AR5416DESC_CONST(_ds)   ((const struct ar5416_desc *)(_ds))