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

Commit 8bd811aa authored by Zhao, Gang's avatar Zhao, Gang Committed by Johannes Berg
Browse files

mac80211: change return value of notifier function 



Return NOTIFY_DONE if we don't care this time's notification, return
NOTIFY_OK if we successfully handled this time's notification. That's
the formal way to do it.

Signed-off-by: default avatarZhao, Gang <gamerh2o@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6784c7db

net/mac80211/iface.c

+5 −6
Original line number Diff line number Diff line
@@ -1787,20 +1787,19 @@ static int netdev_notify(struct notifier_block *nb, 
	struct ieee80211_sub_if_data *sdata;



	if (state != NETDEV_CHANGENAME)

		return 0;

		return NOTIFY_DONE;



	if (!dev->ieee80211_ptr || !dev->ieee80211_ptr->wiphy)

		return 0;

		return NOTIFY_DONE;



	if (dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)

		return 0;

		return NOTIFY_DONE;



	sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	memcpy(sdata->name, dev->name, IFNAMSIZ);



	ieee80211_debugfs_rename_netdev(sdata);

	return 0;



	return NOTIFY_OK;

}



static struct notifier_block mac80211_netdev_notifier = {

net/mac80211/main.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int ieee80211_ifa_changed(struct notifier_block *nb, 


	sdata_unlock(sdata);



	return NOTIFY_DONE;

	return NOTIFY_OK;

}

#endif
@@ -369,7 +369,7 @@ static int ieee80211_ifa6_changed(struct notifier_block *nb, 


	drv_ipv6_addr_change(local, sdata, idev);



	return NOTIFY_DONE;

	return NOTIFY_OK;

}

#endif

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ int ieee80211_max_network_latency(struct notifier_block *nb, 
	ieee80211_recalc_ps(local, latency_usec);

	mutex_unlock(&local->iflist_mtx);



	return 0;

	return NOTIFY_OK;

}



static u8 ieee80211_ht_vht_rx_chains(struct ieee80211_sub_if_data *sdata,