diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-11 15:39:21 -0400 |
| commit | 9687c637388f63b87fcc18eee6e65bcfca4f49ca (patch) | |
| tree | 0929bb8dc602c4f86b6b2e95bca94015de2b0868 /drivers/net/wireless/mwifiex/decl.h | |
| parent | 258daca2bc9f97ace65c9480c901fddfce1e20cf (diff) | |
| parent | 094daf7db7c47861009899ce23f9177d761e20b0 (diff) | |
Merge branch 'for-davem' of git://git.infradead.org/users/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/mwifiex/decl.h')
| -rw-r--r-- | drivers/net/wireless/mwifiex/decl.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h index 94ddc9038cb3..6ca62c809cb9 100644 --- a/drivers/net/wireless/mwifiex/decl.h +++ b/drivers/net/wireless/mwifiex/decl.h | |||
| @@ -114,14 +114,6 @@ struct mwifiex_txinfo { | |||
| 114 | u8 bss_index; | 114 | u8 bss_index; |
| 115 | }; | 115 | }; |
| 116 | 116 | ||
| 117 | struct mwifiex_bss_attr { | ||
| 118 | u8 bss_type; | ||
| 119 | u8 frame_type; | ||
| 120 | u8 active; | ||
| 121 | u8 bss_priority; | ||
| 122 | u8 bss_num; | ||
| 123 | }; | ||
| 124 | |||
| 125 | enum mwifiex_wmm_ac_e { | 117 | enum mwifiex_wmm_ac_e { |
| 126 | WMM_AC_BK, | 118 | WMM_AC_BK, |
| 127 | WMM_AC_BE, | 119 | WMM_AC_BE, |