aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2012-03-03 15:24:43 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-06 15:16:06 -0500
commit972a31367f94967716b000fd8fac33d259ebcfed (patch)
tree9b2fbb597662df40f9fbdfb77003dbdd51d19018 /drivers/net/wireless/p54
parenta9b89e2567c743483e6354f64d7a7e3a8c101e9e (diff)
p54: pass interface setup errors back to mac80211
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r--drivers/net/wireless/p54/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index 40f4eb7da7b2..ee8af1f047c8 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -227,6 +227,7 @@ static int p54_add_interface(struct ieee80211_hw *dev,
227 struct ieee80211_vif *vif) 227 struct ieee80211_vif *vif)
228{ 228{
229 struct p54_common *priv = dev->priv; 229 struct p54_common *priv = dev->priv;
230 int err;
230 231
231 vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER; 232 vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
232 233
@@ -251,9 +252,9 @@ static int p54_add_interface(struct ieee80211_hw *dev,
251 } 252 }
252 253
253 memcpy(priv->mac_addr, vif->addr, ETH_ALEN); 254 memcpy(priv->mac_addr, vif->addr, ETH_ALEN);
254 p54_setup_mac(priv); 255 err = p54_setup_mac(priv);
255 mutex_unlock(&priv->conf_mutex); 256 mutex_unlock(&priv->conf_mutex);
256 return 0; 257 return err;
257} 258}
258 259
259static void p54_remove_interface(struct ieee80211_hw *dev, 260static void p54_remove_interface(struct ieee80211_hw *dev,