* [PATCH] net/mac80211: always true conditionals
@ 2008-05-20 16:42 Nicolas Kaiser
0 siblings, 0 replies; only message in thread
From: Nicolas Kaiser @ 2008-05-20 16:42 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Johannes Berg
Correct always true conditionals.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
---
net/mac80211/cfg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/mac80211/cfg.c 2008-04-17 04:49:44.000000000 +0200
+++ b/net/mac80211/cfg.c 2008-05-20 16:03:29.000000000 +0200
@@ -558,7 +558,7 @@
if (params->vlan) {
sdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);
- if (sdata->vif.type != IEEE80211_IF_TYPE_VLAN ||
+ if (sdata->vif.type != IEEE80211_IF_TYPE_VLAN &&
sdata->vif.type != IEEE80211_IF_TYPE_AP)
return -EINVAL;
} else
@@ -621,7 +621,7 @@
if (params->vlan && params->vlan != sta->dev) {
vlansdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);
- if (vlansdata->vif.type != IEEE80211_IF_TYPE_VLAN ||
+ if (vlansdata->vif.type != IEEE80211_IF_TYPE_VLAN &&
vlansdata->vif.type != IEEE80211_IF_TYPE_AP)
return -EINVAL;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-20 16:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-20 16:42 [PATCH] net/mac80211: always true conditionals Nicolas Kaiser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).