diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /net/mac80211/mlme.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index c396c3522f7b..df12e746b03e 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -508,7 +508,6 @@ static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata, | |||
| 508 | wireless_send_event(sdata->dev, IWEVASSOCREQIE, &wrqu, | 508 | wireless_send_event(sdata->dev, IWEVASSOCREQIE, &wrqu, |
| 509 | ifsta->assocreq_ies); | 509 | ifsta->assocreq_ies); |
| 510 | } | 510 | } |
| 511 | |||
| 512 | if (ifsta->assocresp_ies) { | 511 | if (ifsta->assocresp_ies) { |
| 513 | memset(&wrqu, 0, sizeof(wrqu)); | 512 | memset(&wrqu, 0, sizeof(wrqu)); |
| 514 | wrqu.data.length = ifsta->assocresp_ies_len; | 513 | wrqu.data.length = ifsta->assocresp_ies_len; |