summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-04-21 12:53:04 +0800
committerJohannes Berg <johannes.berg@intel.com>2014-04-25 17:33:44 +0200
commit6784c7db8d43d29aab7f520b54f3aa0c5d51ecbc (patch)
tree9f91b3ee792e6d18c421f7aa91ffa2f712ba4280 /net
parentf26cbf401be935eec13da6fca7088b50d797d78b (diff)
downloadlinux-6784c7db8d43d29aab7f520b54f3aa0c5d51ecbc.tar.bz2
cfg80211: 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: Zhao, Gang <gamerh2o@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/core.c4
-rw-r--r--net/wireless/nl80211.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 5f33462e10ec..b3ff3697239a 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -1002,9 +1002,11 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
if (rfkill_blocked(rdev->rfkill))
return notifier_from_errno(-ERFKILL);
break;
+ default:
+ return NOTIFY_DONE;
}
- return NOTIFY_DONE;
+ return NOTIFY_OK;
}
static struct notifier_block cfg80211_netdev_notifier = {
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 6550e20c8e49..fce423a4e96a 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -11672,7 +11672,7 @@ static int nl80211_netlink_notify(struct notifier_block * nb,
rcu_read_unlock();
- return NOTIFY_DONE;
+ return NOTIFY_OK;
}
static struct notifier_block nl80211_netlink_notifier = {