[PATCH] libertas: remove structure WLAN_802_11_SSID and libertas_escape_essid

Replace WLAN_802_11_SSID with direct 'ssid' and 'ssid_len' members
like ieee80211.  In the process, remove private libertas_escape_essid
and depend on the ieee80211 implementation of escape_essid instead.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 89514f3..fa2399c 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -269,6 +269,7 @@ config IPW2200_DEBUG
 config LIBERTAS
        tristate "Marvell 8xxx Libertas WLAN driver support"
        depends on WLAN_80211
+       select IEEE80211
        select FW_LOADER
        ---help---
          A library for Marvell Libertas 8xxx devices.

diff --cc drivers/net/wireless/libertas/assoc.c
Simple merge

diff --cc drivers/net/wireless/libertas/cmdresp.c
Simple merge

diff --cc drivers/net/wireless/libertas/debugfs.c
Simple merge

diff --cc drivers/net/wireless/libertas/dev.h
Simple merge

diff --cc drivers/net/wireless/libertas/hostcmd.h
Simple merge

diff --cc drivers/net/wireless/libertas/join.c
Simple merge

diff --cc drivers/net/wireless/libertas/join.h
Simple merge

diff --cc drivers/net/wireless/libertas/scan.c
Simple merge

diff --cc drivers/net/wireless/libertas/scan.h
Simple merge

diff --cc drivers/net/wireless/libertas/wext.c
Simple merge