diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-05-11 13:24:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 13:08:25 -0400 |
commit | 15e3d25a7a5c0a79ccf6f81c06efd8f2a78b7161 (patch) | |
tree | 2ae48f55179d3e0e853d1dbc9f6be55afd540ab9 /drivers/net | |
parent | 68c7a1c4733c075246556ebd634d4508bdc87e7e (diff) |
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, | |||
394 | } | 394 | } |
395 | 395 | ||
396 | /* | 396 | /* |
397 | * CFG802.11 operation handler to set channel. | ||
398 | * | ||
399 | * This function can only be used when station is not connected. | ||
400 | */ | ||
401 | static int | ||
402 | mwifiex_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, | ||
403 | struct ieee80211_channel *chan, | ||
404 | enum nl80211_channel_type channel_type) | ||
405 | { | ||
406 | struct mwifiex_private *priv; | ||
407 | struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy); | ||
408 | |||
409 | if (dev) | ||
410 | priv = mwifiex_netdev_get_priv(dev); | ||
411 | else | ||
412 | priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA); | ||
413 | |||
414 | if (priv->media_connected) { | ||
415 | wiphy_err(wiphy, "This is invalid in connected state\n"); | ||
416 | return -EINVAL; | ||
417 | } | ||
418 | |||
419 | return mwifiex_set_rf_channel(priv, chan, channel_type); | ||
420 | } | ||
421 | |||
422 | /* | ||
423 | * This function sets the fragmentation threshold. | 397 | * This function sets the fragmentation threshold. |
424 | * | 398 | * |
425 | * The fragmentation threshold value must lie between MWIFIEX_FRAG_MIN_VALUE | 399 | * The fragmentation threshold value must lie between MWIFIEX_FRAG_MIN_VALUE |
@@ -1661,7 +1635,6 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = { | |||
1661 | .get_station = mwifiex_cfg80211_get_station, | 1635 | .get_station = mwifiex_cfg80211_get_station, |
1662 | .dump_station = mwifiex_cfg80211_dump_station, | 1636 | .dump_station = mwifiex_cfg80211_dump_station, |
1663 | .set_wiphy_params = mwifiex_cfg80211_set_wiphy_params, | 1637 | .set_wiphy_params = mwifiex_cfg80211_set_wiphy_params, |
1664 | .set_channel = mwifiex_cfg80211_set_channel, | ||
1665 | .join_ibss = mwifiex_cfg80211_join_ibss, | 1638 | .join_ibss = mwifiex_cfg80211_join_ibss, |
1666 | .leave_ibss = mwifiex_cfg80211_leave_ibss, | 1639 | .leave_ibss = mwifiex_cfg80211_leave_ibss, |
1667 | .add_key = mwifiex_cfg80211_add_key, | 1640 | .add_key = mwifiex_cfg80211_add_key, |