Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291163
b: refs/heads/master
c: 972a313
h: refs/heads/master
i:
  291161: de63eab
  291159: 7a30993
v: v3
  • Loading branch information
Christian Lamparter authored and John W. Linville committed Mar 6, 2012
1 parent bb162a7 commit 950c425
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: a9b89e2567c743483e6354f64d7a7e3a8c101e9e
refs/heads/master: 972a31367f94967716b000fd8fac33d259ebcfed
5 changes: 3 additions & 2 deletions trunk/drivers/net/wireless/p54/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ static int p54_add_interface(struct ieee80211_hw *dev,
struct ieee80211_vif *vif)
{
struct p54_common *priv = dev->priv;
int err;

vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;

Expand All @@ -251,9 +252,9 @@ static int p54_add_interface(struct ieee80211_hw *dev,
}

memcpy(priv->mac_addr, vif->addr, ETH_ALEN);
p54_setup_mac(priv);
err = p54_setup_mac(priv);
mutex_unlock(&priv->conf_mutex);
return 0;
return err;
}

static void p54_remove_interface(struct ieee80211_hw *dev,
Expand Down

0 comments on commit 950c425

Please sign in to comment.