From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 5 Jan 2009 18:54:53 +0000 (-0800)
Subject: Staging: at76_usb: fix build breakage
X-Git-Tag: v2.6.29-rc1~228^2~151
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f7b31e015acf5cf081c0e84197b5b3582fe34473;p=linux-2.6-omap-h63xx.git

Staging: at76_usb: fix build breakage

The previous patch broke the at76_usb driver due to some other
wireless core api changes.  This patch fixes the driver to build
properly again.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index 4f7ea6f6ca9..bf42a9861f3 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -2057,9 +2057,10 @@ exit:
 	return 0;
 }
 
-static int at76_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
+static int at76_config(struct ieee80211_hw *hw, u32 changed)
 {
 	struct at76_priv *priv = hw->priv;
+	struct ieee80211_conf *conf = &hw->conf;
 
 	at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d",
 		 __func__, conf->channel->hw_value, conf->radio_enabled);
@@ -2089,15 +2090,13 @@ static int at76_config_interface(struct ieee80211_hw *hw,
 {
 	struct at76_priv *priv = hw->priv;
 
-	at76_dbg(DBG_MAC80211, "%s(): ssid_len=%zd", __func__, conf->ssid_len);
-	at76_dbg_dump(DBG_MAC80211, conf->ssid, conf->ssid_len, "ssid:");
 	at76_dbg_dump(DBG_MAC80211, conf->bssid, ETH_ALEN, "bssid:");
 
 	mutex_lock(&priv->mtx);
 
 	memcpy(priv->bssid, conf->bssid, ETH_ALEN);
-	memcpy(priv->essid, conf->ssid, conf->ssid_len);
-	priv->essid_size = conf->ssid_len;
+//	memcpy(priv->essid, conf->ssid, conf->ssid_len);
+//	priv->essid_size = conf->ssid_len;
 
 	if (is_valid_ether_addr(priv->bssid)) {
 		/* mac80211 is joining a bss */