diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-05-11 13:23:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-05-16 13:08:23 -0400 |
commit | 68c7a1c4733c075246556ebd634d4508bdc87e7e (patch) | |
tree | c772934efbfb15581d46b1f067fa3d7f6a946cea /drivers/net/wireless | |
parent | 578977264199de9815ace51ade87cec4894cf010 (diff) |
rndis_wlan: remove set_channel cfg80211 hook
Since rndis_wlan 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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index d66e2980bc27..8b2226262524 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -554,9 +554,6 @@ static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev, | |||
554 | 554 | ||
555 | static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev); | 555 | static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev); |
556 | 556 | ||
557 | static int rndis_set_channel(struct wiphy *wiphy, struct net_device *dev, | ||
558 | struct ieee80211_channel *chan, enum nl80211_channel_type channel_type); | ||
559 | |||
560 | static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, | 557 | static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, |
561 | u8 key_index, bool pairwise, const u8 *mac_addr, | 558 | u8 key_index, bool pairwise, const u8 *mac_addr, |
562 | struct key_params *params); | 559 | struct key_params *params); |
@@ -598,7 +595,6 @@ static const struct cfg80211_ops rndis_config_ops = { | |||
598 | .disconnect = rndis_disconnect, | 595 | .disconnect = rndis_disconnect, |
599 | .join_ibss = rndis_join_ibss, | 596 | .join_ibss = rndis_join_ibss, |
600 | .leave_ibss = rndis_leave_ibss, | 597 | .leave_ibss = rndis_leave_ibss, |
601 | .set_channel = rndis_set_channel, | ||
602 | .add_key = rndis_add_key, | 598 | .add_key = rndis_add_key, |
603 | .del_key = rndis_del_key, | 599 | .del_key = rndis_del_key, |
604 | .set_default_key = rndis_set_default_key, | 600 | .set_default_key = rndis_set_default_key, |
@@ -2423,16 +2419,6 @@ static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev) | |||
2423 | return deauthenticate(usbdev); | 2419 | return deauthenticate(usbdev); |
2424 | } | 2420 | } |
2425 | 2421 | ||
2426 | static int rndis_set_channel(struct wiphy *wiphy, struct net_device *netdev, | ||
2427 | struct ieee80211_channel *chan, enum nl80211_channel_type channel_type) | ||
2428 | { | ||
2429 | struct rndis_wlan_private *priv = wiphy_priv(wiphy); | ||
2430 | struct usbnet *usbdev = priv->usbdev; | ||
2431 | |||
2432 | return set_channel(usbdev, | ||
2433 | ieee80211_frequency_to_channel(chan->center_freq)); | ||
2434 | } | ||
2435 | |||
2436 | static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, | 2422 | static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, |
2437 | u8 key_index, bool pairwise, const u8 *mac_addr, | 2423 | u8 key_index, bool pairwise, const u8 *mac_addr, |
2438 | struct key_params *params) | 2424 | struct key_params *params) |