summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-10-31 14:16:12 +0100
committerJohannes Berg <johannes.berg@intel.com>2014-10-31 14:19:19 +0100
commitde4fcbadde68e3429cc533c29abf6fbceda4628f (patch)
tree6f797d624377a194d2a327f740b827898ce868d9 /net/wireless
parent579a05f29611dcef94b6bda21f1d059ab189a263 (diff)
downloadop-kernel-dev-de4fcbadde68e3429cc533c29abf6fbceda4628f.zip
op-kernel-dev-de4fcbadde68e3429cc533c29abf6fbceda4628f.tar.gz
cfg80211: avoid using default in interface type switch
Most code avoids having a default case in interface type switch statements already, to make it easier to find places that need to be extended. Change the code in the __cfg80211_leave() and nl80211_key_allowed() functions to not have a default case. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c14
-rw-r--r--net/wireless/nl80211.c6
2 files changed, 18 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 87bb502..da4dcb6 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -869,7 +869,19 @@ void __cfg80211_leave(struct cfg80211_registered_device *rdev,
case NL80211_IFTYPE_P2P_GO:
__cfg80211_stop_ap(rdev, dev, true);
break;
- default:
+ case NL80211_IFTYPE_WDS:
+ /* must be handled by mac80211/driver, has no APIs */
+ break;
+ case NL80211_IFTYPE_P2P_DEVICE:
+ /* cannot happen, has no netdev */
+ break;
+ case NL80211_IFTYPE_AP_VLAN:
+ case NL80211_IFTYPE_MONITOR:
+ /* nothing to do */
+ break;
+ case NL80211_IFTYPE_UNSPECIFIED:
+ case NUM_NL80211_IFTYPES:
+ /* invalid */
break;
}
}
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 33aff74..f7d9188 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -884,7 +884,11 @@ static int nl80211_key_allowed(struct wireless_dev *wdev)
if (!wdev->current_bss)
return -ENOLINK;
break;
- default:
+ case NL80211_IFTYPE_UNSPECIFIED:
+ case NL80211_IFTYPE_MONITOR:
+ case NL80211_IFTYPE_P2P_DEVICE:
+ case NL80211_IFTYPE_WDS:
+ case NUM_NL80211_IFTYPES:
return -EINVAL;
}
OpenPOWER on IntegriCloud