diff options
author | Eliad Peller <eliad@wizery.com> | 2010-09-19 12:55:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 11:05:29 -0400 |
commit | 9ee82d541095cb64bf16a1f5d7573a8cddc125aa (patch) | |
tree | babd0a8aed1651eeafd34f8764702681c62fa15a /drivers | |
parent | 58be4607d25f86962dee6cc6b30573f95303517e (diff) |
wl1271: bugfix: use bitwise-AND instead of logical-AND
typo - while looking for specific bits we should do a bitwise-AND instead of logical-AND.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index af26150109e3..776cd7c41148 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -1634,7 +1634,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, | |||
1634 | if (ret < 0) | 1634 | if (ret < 0) |
1635 | goto out; | 1635 | goto out; |
1636 | 1636 | ||
1637 | if ((changed && BSS_CHANGED_BEACON_INT) && | 1637 | if ((changed & BSS_CHANGED_BEACON_INT) && |
1638 | (wl->bss_type == BSS_TYPE_IBSS)) { | 1638 | (wl->bss_type == BSS_TYPE_IBSS)) { |
1639 | wl1271_debug(DEBUG_ADHOC, "ad-hoc beacon interval updated: %d", | 1639 | wl1271_debug(DEBUG_ADHOC, "ad-hoc beacon interval updated: %d", |
1640 | bss_conf->beacon_int); | 1640 | bss_conf->beacon_int); |
@@ -1643,7 +1643,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, | |||
1643 | do_join = true; | 1643 | do_join = true; |
1644 | } | 1644 | } |
1645 | 1645 | ||
1646 | if ((changed && BSS_CHANGED_BEACON) && | 1646 | if ((changed & BSS_CHANGED_BEACON) && |
1647 | (wl->bss_type == BSS_TYPE_IBSS)) { | 1647 | (wl->bss_type == BSS_TYPE_IBSS)) { |
1648 | struct sk_buff *beacon = ieee80211_beacon_get(hw, vif); | 1648 | struct sk_buff *beacon = ieee80211_beacon_get(hw, vif); |
1649 | 1649 | ||