projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfg80211: remove enum ieee80211_band
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
realtek
/
rtlwifi
/
wifi.h
diff --git
a/drivers/net/wireless/realtek/rtlwifi/wifi.h
b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index
554d814
..
11d9c23
100644
(file)
--- a/
drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/
drivers/net/wireless/realtek/rtlwifi/wifi.h
@@
-1359,7
+1359,7
@@
struct rtl_mac {
u32 tx_ss_num;
u32 rx_ss_num;
u32 tx_ss_num;
u32 rx_ss_num;
- struct ieee80211_supported_band bands[
IEEE80211_NUM
_BANDS];
+ struct ieee80211_supported_band bands[
NUM_NL80211
_BANDS];
struct ieee80211_hw *hw;
struct ieee80211_vif *vif;
enum nl80211_iftype opmode;
struct ieee80211_hw *hw;
struct ieee80211_vif *vif;
enum nl80211_iftype opmode;
@@
-2246,6
+2246,9
@@
struct rtl_mod_params {
/* default 0: 1 means do not disable interrupts */
bool int_clear;
/* default 0: 1 means do not disable interrupts */
bool int_clear;
+
+ /* select antenna */
+ int ant_sel;
};
struct rtl_hal_usbint_cfg {
};
struct rtl_hal_usbint_cfg {
@@
-2867,7
+2870,7
@@
value to host byte ordering.*/
(ppsc->cur_ps_level |= _ps_flg)
#define container_of_dwork_rtl(x, y, z) \
(ppsc->cur_ps_level |= _ps_flg)
#define container_of_dwork_rtl(x, y, z) \
- container_of(
container_of(x, struct delayed_work, work
), y, z)
+ container_of(
to_delayed_work(x
), y, z)
#define FILL_OCTET_STRING(_os, _octet, _len) \
(_os).octet = (u8 *)(_octet); \
#define FILL_OCTET_STRING(_os, _octet, _len) \
(_os).octet = (u8 *)(_octet); \