[Madwifi-cvs] revision 2511 committed
Status: Beta
Brought to you by:
otaku
From: Matthew W. S. B. <svn...@ma...> - 2007-06-23 15:13:23
|
Project : madwifi Revision : 2511 Author : mentor (Matthew W. S. Bell) Date : 2007-06-23 17:13:11 +0200 (Sat, 23 Jun 2007) Log Message : Put logical operator around bit operations rather than right in the middle - re r2471 Affected Files: * trunk/net80211/ieee80211_crypto.c updated * trunk/net80211/ieee80211_var.h updated Modified: trunk/net80211/ieee80211_crypto.c =================================================================== --- trunk/net80211/ieee80211_crypto.c 2007-06-22 20:52:32 UTC (rev 2510) +++ trunk/net80211/ieee80211_crypto.c 2007-06-23 15:13:11 UTC (rev 2511) @@ -332,7 +332,7 @@ * If the hardware does not support the cipher then * fallback to a host-based implementation. */ - if ((vap->iv_caps & !(1 << cipher))) { + if (!(vap->iv_caps & (1 << cipher))) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: no h/w support for cipher %s, falling back to s/w\n", __func__, cip->ic_name); Modified: trunk/net80211/ieee80211_var.h =================================================================== --- trunk/net80211/ieee80211_var.h 2007-06-22 20:52:32 UTC (rev 2510) +++ trunk/net80211/ieee80211_var.h 2007-06-23 15:13:11 UTC (rev 2511) @@ -504,8 +504,10 @@ #define IEEE80211_VAP_EOSPDROP_ENABLE(_v) ((_v)->iv_flags_ext |= IEEE80211_FEXT_EOSPDROP) #define IEEE80211_VAP_EOSPDROP_DISABLE(_v) ((_v)->iv_flags_ext &= ~IEEE80211_FEXT_EOSPDROP) #define IEEE80211_VAP_EOSPDROP_ENABLED(_v) ((_v)->iv_flags_ext & IEEE80211_FEXT_EOSPDROP) -#define IEEE80211_VAP_DROPUNENC_EAPOL_ENABLE(_v) ((_v)->iv_flags_ext |= IEEE80211_FEXT_DROPUNENC_EAPOL) -#define IEEE80211_VAP_DROPUNENC_EAPOL_DISABLE(_v) ((_v)->iv_flags_ext &= ~IEEE80211_FEXT_DROPUNENC_EAPOL) +#define IEEE80211_VAP_DROPUNENC_EAPOL_ENABLE(_v) \ + ((_v)->iv_flags_ext |= IEEE80211_FEXT_DROPUNENC_EAPOL) +#define IEEE80211_VAP_DROPUNENC_EAPOL_DISABLE(_v) \ + ((_v)->iv_flags_ext &= ~IEEE80211_FEXT_DROPUNENC_EAPOL) #define IEEE80211_VAP_DROPUNENC_EAPOL(_v) ((_v)->iv_flags_ext & IEEE80211_FEXT_DROPUNENC_EAPOL) |