mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2025-02-16 23:34:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using preprocessor conditionals inside macro arguments

Browse Source 
Sparse doesn't like it, and it's ugly indeed.


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2914 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2007-11-22 01:28:29 +00:00
parent 9dc2e2884a
commit 22436a7615
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net80211/ieee80211_output.c
View File

@ -1771,6 +1771,7 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg)
struct ieee80211com *ic = ni->ni_ic;
struct sk_buff *skb;
u_int8_t *frm;
int frm_len;
u_int16_t capinfo;
ieee80211_keyix_t def_keyindex;
int has_challenge, is_shared_key, ret, timer, status;
@ -1798,8 +1799,7 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg)
* [tlv] Atheros Advanced Capabilities
* [tlv] AtherosXR parameters
*/
skb = ieee80211_getmgtframe(&frm,
8
frm_len = 8
+ sizeof(u_int16_t)
+ sizeof(u_int16_t)
+ 2 + IEEE80211_NWID_LEN
@ -1815,12 +1815,12 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg)
+ (vap->iv_flags & IEEE80211_F_WPA ?
2 * sizeof(struct ieee80211_ie_wpa) : 0)
+ sizeof(struct ieee80211_ie_athAdvCap)
+ vap->app_ie[IEEE80211_APPIE_FRAME_PROBE_RESP].length;
#ifdef ATH_SUPERG_XR
+ (vap->iv_ath_cap & IEEE80211_ATHC_XR ? /* XR */
sizeof(struct ieee80211_xr_param) : 0)
if (vap->iv_ath_cap & IEEE80211_ATHC_XR)
frm_len += sizeof(struct ieee80211_xr_param);
#endif
+ vap->app_ie[IEEE80211_APPIE_FRAME_PROBE_RESP].length
);
skb = ieee80211_getmgtframe(&frm, frm_len);
if (skb == NULL)
senderr(ENOMEM, is_tx_nobuf);