diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-05-11 19:24:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 13:08:25 -0400 |
| commit | 15e3d25a7a5c0a79ccf6f81c06efd8f2a78b7161 (patch) | |
| tree | 2ae48f55179d3e0e853d1dbc9f6be55afd540ab9 /drivers/net | |
| parent | 68c7a1c4733c075246556ebd634d4508bdc87e7e (diff) | |
| download | linux-stable-15e3d25a7a5c0a79ccf6f81c06efd8f2a78b7161.tar.gz linux-stable-15e3d25a7a5c0a79ccf6f81c06efd8f2a78b7161.tar.bz2 linux-stable-15e3d25a7a5c0a79ccf6f81c06efd8f2a78b7161.zip | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index f315ffcedb06..87671446e24b 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -394,32 +394,6 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv, } /* - * 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. * * The fragmentation threshold value must lie between MWIFIEX_FRAG_MIN_VALUE @@ -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, |