Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c7a1c4 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 57897726

drivers/net/wireless/rndis_wlan.c

+0 −14
Original line number Diff line number Diff line
@@ -554,9 +554,6 @@ static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev, 


static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev);



static int rndis_set_channel(struct wiphy *wiphy, struct net_device *dev,

	struct ieee80211_channel *chan, enum nl80211_channel_type channel_type);



static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev,

			 u8 key_index, bool pairwise, const u8 *mac_addr,

			 struct key_params *params);
@@ -598,7 +595,6 @@ static const struct cfg80211_ops rndis_config_ops = { 
	.disconnect = rndis_disconnect,

	.join_ibss = rndis_join_ibss,

	.leave_ibss = rndis_leave_ibss,

	.set_channel = rndis_set_channel,

	.add_key = rndis_add_key,

	.del_key = rndis_del_key,

	.set_default_key = rndis_set_default_key,
@@ -2423,16 +2419,6 @@ static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev) 
	return deauthenticate(usbdev);

}



static int rndis_set_channel(struct wiphy *wiphy, struct net_device *netdev,

	struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)

{

	struct rndis_wlan_private *priv = wiphy_priv(wiphy);

	struct usbnet *usbdev = priv->usbdev;



	return set_channel(usbdev,

			ieee80211_frequency_to_channel(chan->center_freq));

}



static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev,

			 u8 key_index, bool pairwise, const u8 *mac_addr,

			 struct key_params *params)