net/mac80211: always true conditionals

PATCH New Nicolas Kaiser 1 participant 1 message May 20, 2008 mac80211

lore

Share & tools

lore

Nicolas Kaiser

author

2008-05-20 16:50 UTC #0 lore raw

PATCH 1/1 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(-)

net/mac80211/cfg.c +2 -2

@@ -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;