lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-09-08 16:59:05 -07:00
parent 712d6954e3 82a28c794f
commit 17dce5dfe3
1036 changed files with 34407 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/mlme.c
View File

@@ -508,7 +508,6 @@ static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata,
wireless_send_event(sdata->dev, IWEVASSOCREQIE, &wrqu,
ifsta->assocreq_ies);
}
if (ifsta->assocresp_ies) {
memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = ifsta->assocresp_ies_len;