]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Staging: at76_usb: fix build breakage
authorGreg Kroah-Hartman <gregkh@suse.de>
Mon, 5 Jan 2009 18:54:53 +0000 (10:54 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 6 Jan 2009 21:52:02 +0000 (13:52 -0800)
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>
drivers/staging/at76_usb/at76_usb.c

index 4f7ea6f6ca9b4376b27ee6e276f2fd25ff583523..bf42a9861f36f48de0aa737de0b78186e84c11d8 100644 (file)
@@ -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 */