cfg80211: infer WPA and WPA2 support from TKIP and CCMP
authorDavid Kilroy <kilroyd@googlemail.com>
Thu, 18 Jun 2009 22:21:17 +0000 (23:21 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 Jul 2009 19:01:42 +0000 (15:01 -0400)
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/wireless/wext-compat.c

Simple merge