Commit 69c3f2d3 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

wifi: nl80211: allow link ID in set_wiphy with frequency 



This simplifies hostapd implementation, since it didn't
switch to NL80211_CMD_SET_CHANNEL.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0d5891e3

net/wireless/nl80211.c

+5 −2
Original line number Diff line number Diff line
@@ -3475,16 +3475,19 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) 
	}









	if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {









		int link_id = nl80211_link_id_or_invalid(info->attrs);

















		if (wdev) {









			wdev_lock(wdev);









			result = __nl80211_set_channel(









				rdev,









				nl80211_can_set_dev_channel(wdev) ? netdev : NULL,









				info, -1);









				info, link_id);









			wdev_unlock(wdev);









		} else {









			result = __nl80211_set_channel(rdev, netdev, info, -1);









			result = __nl80211_set_channel(rdev, netdev, info, link_id);









		}

















		if (result)









			goto out;









	}