From b25f348273a198c354dc9354df7ad142eae68bd5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 Jan 2009 10:54:53 -0800 Subject: [PATCH] --- yaml --- r: 126625 b: refs/heads/master c: f7b31e015acf5cf081c0e84197b5b3582fe34473 h: refs/heads/master i: 126623: 6040c778d1408fd96ecb56c7d11e8a00bfdb9850 v: v3 --- [refs] | 2 +- trunk/drivers/staging/at76_usb/at76_usb.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dace8bce8958..6de302f81a79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02227c28391b5059a7710d6039c52912b0ee2c1d +refs/heads/master: f7b31e015acf5cf081c0e84197b5b3582fe34473 diff --git a/trunk/drivers/staging/at76_usb/at76_usb.c b/trunk/drivers/staging/at76_usb/at76_usb.c index 4f7ea6f6ca9b..bf42a9861f36 100644 --- a/trunk/drivers/staging/at76_usb/at76_usb.c +++ b/trunk/drivers/staging/at76_usb/at76_usb.c @@ -2057,9 +2057,10 @@ static int at76_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) 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 */