Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126625
b: refs/heads/master
c: f7b31e0
h: refs/heads/master
i:
  126623: 6040c77
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent 09995b8 commit b25f348
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 02227c28391b5059a7710d6039c52912b0ee2c1d
refs/heads/master: f7b31e015acf5cf081c0e84197b5b3582fe34473
9 changes: 4 additions & 5 deletions trunk/drivers/staging/at76_usb/at76_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit b25f348

Please sign in to comment.