diff options
author | Zhao, Gang <gamerh2o@gmail.com> | 2014-04-21 00:53:04 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-25 11:33:44 -0400 |
commit | 6784c7db8d43d29aab7f520b54f3aa0c5d51ecbc (patch) | |
tree | 9f91b3ee792e6d18c421f7aa91ffa2f712ba4280 /net/wireless | |
parent | f26cbf401be935eec13da6fca7088b50d797d78b (diff) |
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/wireless')
-rw-r--r-- | net/wireless/core.c | 4 | ||||
-rw-r--r-- | net/wireless/nl80211.c | 2 |
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, | |||
1002 | if (rfkill_blocked(rdev->rfkill)) | 1002 | if (rfkill_blocked(rdev->rfkill)) |
1003 | return notifier_from_errno(-ERFKILL); | 1003 | return notifier_from_errno(-ERFKILL); |
1004 | break; | 1004 | break; |
1005 | default: | ||
1006 | return NOTIFY_DONE; | ||
1005 | } | 1007 | } |
1006 | 1008 | ||
1007 | return NOTIFY_DONE; | 1009 | return NOTIFY_OK; |
1008 | } | 1010 | } |
1009 | 1011 | ||
1010 | static struct notifier_block cfg80211_netdev_notifier = { | 1012 | 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, | |||
11672 | 11672 | ||
11673 | rcu_read_unlock(); | 11673 | rcu_read_unlock(); |
11674 | 11674 | ||
11675 | return NOTIFY_DONE; | 11675 | return NOTIFY_OK; |
11676 | } | 11676 | } |
11677 | 11677 | ||
11678 | static struct notifier_block nl80211_netlink_notifier = { | 11678 | static struct notifier_block nl80211_netlink_notifier = { |