diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-05 10:54:53 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:52:02 -0800 |
| commit | f7b31e015acf5cf081c0e84197b5b3582fe34473 (patch) | |
| tree | 8709cba5914fd80d391f3e6ae3de8962f112890c /drivers/staging/at76_usb | |
| parent | 02227c28391b5059a7710d6039c52912b0ee2c1d (diff) | |
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>
Diffstat (limited to 'drivers/staging/at76_usb')
| -rw-r--r-- | drivers/staging/at76_usb/at76_usb.c | 9 |
1 files changed, 4 insertions, 5 deletions
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 */ |