浏览代码

net/mac80211: always true conditionals

Correct always true conditionals.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Nicolas Kaiser 17 年之前
父节点
当前提交
679fda1aa4
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      net/mac80211/cfg.c

+ 2 - 2
net/mac80211/cfg.c

@@ -672,7 +672,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 	if (params->vlan) {
 	if (params->vlan) {
 		sdata = IEEE80211_DEV_TO_SUB_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)
 		    sdata->vif.type != IEEE80211_IF_TYPE_AP)
 			return -EINVAL;
 			return -EINVAL;
 	} else
 	} else
@@ -760,7 +760,7 @@ static int ieee80211_change_station(struct wiphy *wiphy,
 	if (params->vlan && params->vlan != sta->sdata->dev) {
 	if (params->vlan && params->vlan != sta->sdata->dev) {
 		vlansdata = IEEE80211_DEV_TO_SUB_IF(params->vlan);
 		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) {
 		    vlansdata->vif.type != IEEE80211_IF_TYPE_AP) {
 			rcu_read_unlock();
 			rcu_read_unlock();
 			return -EINVAL;
 			return -EINVAL;