diff options
author | Bing Zhao <bzhao@marvell.com> | 2011-03-28 20:55:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-04 16:20:04 -0400 |
commit | eecd8250e492ffc4e7b72953cda9c2f3ba0e6ccc (patch) | |
tree | 1897ca77a7d7746bd6c2fd8f748e06bee971bdfb /drivers/net/wireless/mwifiex/main.h | |
parent | 6a4c499e86f54ed9316a87e7ddc6b7d33adb4976 (diff) |
mwifiex: remove MWIFIEX_BSS_MODE_ macros
replace them with NL80211_IFTYPE_ macros
Also remove redundant functions mwifiex_drv_get_mode()
and mwifiex_bss_ioctl_mode().
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.h')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index 7bcb2e965aeb..12b9a364d52b 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -877,7 +877,7 @@ mwifiex_queuing_ra_based(struct mwifiex_private *priv) | |||
877 | * Currently we assume if we are in Infra, then DA=RA. This might not be | 877 | * Currently we assume if we are in Infra, then DA=RA. This might not be |
878 | * true in the future | 878 | * true in the future |
879 | */ | 879 | */ |
880 | if ((priv->bss_mode == MWIFIEX_BSS_MODE_INFRA) && | 880 | if ((priv->bss_mode == NL80211_IFTYPE_STATION) && |
881 | (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)) | 881 | (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)) |
882 | return false; | 882 | return false; |
883 | 883 | ||
@@ -1003,8 +1003,6 @@ int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv, | |||
1003 | int mwifiex_change_adhoc_chan(struct mwifiex_private *priv, int channel); | 1003 | int mwifiex_change_adhoc_chan(struct mwifiex_private *priv, int channel); |
1004 | int mwifiex_set_radio(struct mwifiex_private *priv, u8 option); | 1004 | int mwifiex_set_radio(struct mwifiex_private *priv, u8 option); |
1005 | 1005 | ||
1006 | int mwifiex_drv_get_mode(struct mwifiex_private *priv, u8 wait_option); | ||
1007 | |||
1008 | int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, int channel); | 1006 | int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, int channel); |
1009 | 1007 | ||
1010 | int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key, | 1008 | int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key, |
@@ -1043,9 +1041,6 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv, int type, int dbm); | |||
1043 | 1041 | ||
1044 | int mwifiex_main_process(struct mwifiex_adapter *); | 1042 | int mwifiex_main_process(struct mwifiex_adapter *); |
1045 | 1043 | ||
1046 | int mwifiex_bss_ioctl_mode(struct mwifiex_private *, | ||
1047 | struct mwifiex_wait_queue *, | ||
1048 | u16 action, int *mode); | ||
1049 | int mwifiex_bss_ioctl_channel(struct mwifiex_private *, | 1044 | int mwifiex_bss_ioctl_channel(struct mwifiex_private *, |
1050 | u16 action, | 1045 | u16 action, |
1051 | struct mwifiex_chan_freq_power *cfp); | 1046 | struct mwifiex_chan_freq_power *cfp); |