Thread: [Madwifi-cvs] madwifi/net80211 ieee80211_output.c,1.8.2.18,1.8.2.19
Status: Beta
Brought to you by:
otaku
From: Sebastian W. <to...@us...> - 2005-03-28 14:06:37
|
Update of /cvsroot/madwifi/madwifi/net80211 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12521/net80211 Modified Files: Tag: BSD ieee80211_output.c Log Message: - insert wme ie not in probe request but in probe response, as reported by Ghislain Mary - cleaned up Index: ieee80211_output.c =================================================================== RCS file: /cvsroot/madwifi/madwifi/net80211/ieee80211_output.c,v retrieving revision 1.8.2.18 retrieving revision 1.8.2.19 diff -C2 -d -r1.8.2.18 -r1.8.2.19 *** ieee80211_output.c 24 Mar 2005 15:25:49 -0000 1.8.2.18 --- ieee80211_output.c 28 Mar 2005 14:06:26 -0000 1.8.2.19 *************** *** 147,152 **** IEEE80211_NODE_STAT(ni, tx_mgmt); IF_ENQUEUE(&ic->ic_mgtq, skb); - mod_timer(&ic->ic_slowtimo, jiffies + HZ); - //if_start(dev); (*dev->hard_start_xmit)(NULL, dev); return 0; --- 147,150 ---- *************** *** 194,198 **** IF_ENQUEUE(&ic->ic_mgtq, skb); /* cheat */ - //if_start(dev); (*dev->hard_start_xmit)(NULL, dev); --- 192,195 ---- *************** *** 948,952 **** * [tlv] supported rates * [tlv] extended supported rates - * [tlv] WME (optional) * [tlv] user-specified ie's */ --- 945,948 ---- *************** *** 955,959 **** + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) - + sizeof(struct ieee80211_wme_param) + (ic->ic_opt_ie != NULL ? ic->ic_opt_ie_len : 0) ); --- 951,954 ---- *************** *** 965,970 **** frm = ieee80211_add_rates(frm, &ic->ic_sup_rates[mode]); frm = ieee80211_add_xrates(frm, &ic->ic_sup_rates[mode]); - if (ic->ic_flags & IEEE80211_F_WME) - frm = ieee80211_add_wme_param(frm, &ic->ic_wme); if (ic->ic_opt_ie != NULL) { memcpy(frm, ic->ic_opt_ie, ic->ic_opt_ie_len); --- 960,963 ---- *************** *** 991,994 **** --- 984,988 ---- * [tlv] extended supported rates * [tlv] WPA + * [tlv] WME (optional) */ skb = ieee80211_getmgtframe(&frm, *************** *** 1005,1008 **** --- 999,1003 ---- + (ic->ic_flags & IEEE80211_F_WPA ? 2*sizeof(struct ieee80211_ie_wpa) : 0) + + sizeof(struct ieee80211_wme_param) ); if (skb == NULL) *************** *** 1052,1060 **** *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ } ! if (ic->ic_flags & IEEE80211_F_WPA) ! frm = ieee80211_add_wpa(frm, ic); if (ic->ic_curmode == IEEE80211_MODE_11G) frm = ieee80211_add_erp(frm, ic); ! frm = ieee80211_add_xrates(frm, &ni->ni_rates); skb_trim(skb, frm - skb->data); break; --- 1047,1057 ---- *frm++ = 0; *frm++ = 0; /* TODO: ATIM window */ } ! frm = ieee80211_add_xrates(frm, &ni->ni_rates); if (ic->ic_curmode == IEEE80211_MODE_11G) frm = ieee80211_add_erp(frm, ic); ! if (ic->ic_flags & IEEE80211_F_WPA) ! frm = ieee80211_add_wpa(frm, ic); ! if (ic->ic_flags & IEEE80211_F_WME) ! frm = ieee80211_add_wme_param(frm, &ic->ic_wme); skb_trim(skb, frm - skb->data); break; |