Commit dbda949b authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: cfg80211: make some regulatory functions void 



The return value of regulatory_hint_indoor() is always 0 for
success, and the return value of regulatory_hint_found_beacon()
is always ignored. Make them both have void return.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 630009e2

net/wireless/nl80211.c

+2 −1
Original line number Diff line number Diff line
@@ -8116,7 +8116,8 @@ static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info) 
			is_indoor = true;

		}









		return regulatory_hint_indoor(is_indoor, owner_nlportid);









		regulatory_hint_indoor(is_indoor, owner_nlportid);









		return 0;









	default:









		return -EINVAL;









	}


































net/wireless/reg.c



+7
−11






























Original line number
Diff line number
Diff line







@@ -3284,7 +3284,7 @@ int regulatory_hint_user(const char *alpha2,







	return 0;









}



















int regulatory_hint_indoor(bool is_indoor, u32 portid)









void regulatory_hint_indoor(bool is_indoor, u32 portid)









{









	spin_lock(&reg_indoor_lock);




















@@ -3307,8 +3307,6 @@ int regulatory_hint_indoor(bool is_indoor, u32 portid)

















	if (!is_indoor)









		reg_check_channels();



















	return 0;









}



















void regulatory_netlink_notify(u32 portid)










@@ -3666,7 +3664,7 @@ static bool pending_reg_beacon(struct ieee80211_channel *beacon_chan)







	return false;









}



















int regulatory_hint_found_beacon(struct wiphy *wiphy,









void regulatory_hint_found_beacon(struct wiphy *wiphy,









				  struct ieee80211_channel *beacon_chan,









				  gfp_t gfp)









{










@@ -3677,18 +3675,18 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,







	    beacon_chan->flags & IEEE80211_CHAN_RADAR ||









	    (beacon_chan->band == NL80211_BAND_2GHZ &&









	     !freq_is_chan_12_13_14(beacon_chan->center_freq)))









		return 0;









		return;



















	spin_lock_bh(&reg_pending_beacons_lock);









	processing = pending_reg_beacon(beacon_chan);









	spin_unlock_bh(&reg_pending_beacons_lock);



















	if (processing)









		return 0;









		return;



















	reg_beacon = kzalloc(sizeof(struct reg_beacon), gfp);









	if (!reg_beacon)









		return -ENOMEM;









		return;



















	pr_debug("Found new beacon on frequency: %d.%03d MHz (Ch %d) on %s\n",









		 beacon_chan->center_freq, beacon_chan->freq_offset,










@@ -3708,8 +3706,6 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,







	spin_unlock_bh(&reg_pending_beacons_lock);



















	schedule_work(&reg_work);



















	return 0;









}



















static void print_rd_rules(const struct ieee80211_regdomain *rd)


































net/wireless/reg.h



+4
−4






























Original line number
Diff line number
Diff line







@@ -42,7 +42,7 @@ int regulatory_hint_user(const char *alpha2,







 * device is operating in an indoor environment.









 * @portid: the netlink port ID on which the hint was given.









 */









int regulatory_hint_indoor(bool is_indoor, u32 portid);









void regulatory_hint_indoor(bool is_indoor, u32 portid);



















/**









 * regulatory_netlink_notify - notify on released netlink socket










@@ -82,7 +82,7 @@ bool reg_last_request_cell_base(void);







 * on a newly found BSS. If you cannot make use of this feature you can









 * set the wiphy->disable_beacon_hints to true.









 */









int regulatory_hint_found_beacon(struct wiphy *wiphy,









void regulatory_hint_found_beacon(struct wiphy *wiphy,









				  struct ieee80211_channel *beacon_chan,









				  gfp_t gfp);