diff options
| author | Nicolas Kaiser <nikai@nikai.net> | 2008-05-20 18:42:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-28 16:43:41 -0400 |
| commit | 679fda1aa49fddf938bb699df7867c01988371ab (patch) | |
| tree | 722b26d78f285fc1d248f0e981e827769f45a616 /net/mac80211/cfg.c | |
| parent | 6b4bec010d888c5b8c731aa596635cd83dd3416c (diff) | |
| download | kernel_samsung_crespo-679fda1aa49fddf938bb699df7867c01988371ab.zip kernel_samsung_crespo-679fda1aa49fddf938bb699df7867c01988371ab.tar.gz kernel_samsung_crespo-679fda1aa49fddf938bb699df7867c01988371ab.tar.bz2 | |
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>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 699d97b..a9fce4a 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -672,7 +672,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 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 @@ -760,7 +760,7 @@ static int ieee80211_change_station(struct wiphy *wiphy, if (params->vlan && params->vlan != sta->sdata->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) { rcu_read_unlock(); return -EINVAL; |