openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mwifiex: remove set_channel cfg80211 hook 

Since mwifiex only supports managed and IBSS
modes, it doesn't need a set_channel call. The
callback might be called, but it won't matter
as nothing can use the channel.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2012-05-11 19:24:34 +02:00 committed by John W. Linville
parent 68c7a1c473
commit 15e3d25a7a
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/wireless/mwifiex/cfg80211.c
View File

@ -393,32 +393,6 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv,
return mwifiex_uap_set_channel(priv, cfp.channel);
}
/*
* CFG802.11 operation handler to set channel.
*
* This function can only be used when station is not connected.
*/
static int
mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
struct ieee80211_channel *chan,
enum nl80211_channel_type channel_type)
{
struct mwifiex_private *priv;
struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
if (dev)
priv = mwifiex_netdev_get_priv(dev);
else
priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
if (priv->media_connected) {
wiphy_err(wiphy, "This is invalid in connected state\n");
return -EINVAL;
}
return mwifiex_set_rf_channel(priv, chan, channel_type);
}
/*
* This function sets the fragmentation threshold.
*
@ -1661,7 +1635,6 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
.get_station = mwifiex_cfg80211_get_station,
.dump_station = mwifiex_cfg80211_dump_station,
.set_wiphy_params = mwifiex_cfg80211_set_wiphy_params,
.set_channel = mwifiex_cfg80211_set_channel,
.join_ibss = mwifiex_cfg80211_join_ibss,
.leave_ibss = mwifiex_cfg80211_leave_ibss,
.add_key = mwifiex_cfg80211_add_key,