wireless: restore revert lost to merge damage
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Sep 2008 19:38:09 +0000 (12:38 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Oct 2008 22:12:56 +0000 (18:12 -0400)
commit74af025073461b9ebe82771e48a5b8596c3cf75c
tree825ea044380e8a200b0ac7729871db0b9b8702f1
parent8ec8ebaeceedf3a845f9e23885f26d0d00eefeb7
wireless: restore revert lost to merge damage

Restore revert "mac80211: Use IWEVASSOCREQIE instead of IWEVCUSTOM",
originally reverted in commit bf7394ccc13fe291d9258f01113b4c61214ddeae.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/mlme.c