2008-05-20 16:50:09

by Nicolas Kaiser

[permalink] [raw]
Subject: [PATCH] net/mac80211: always true conditionals

Correct always true conditionals.

Signed-off-by: Nicolas Kaiser <[email protected]>
---

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;