Commit 6bbdce5a authored by John W. Linville's avatar John W. Linville Committed by Jeff Garzik

[PATCH] softmac: avoid assert in ieee80211softmac_wx_get_rate

Unconfigured bcm43xx device can hit an assert() during wx_get_rate
queries.  This is because bcm43xx calls ieee80211softmac_start late
(i.e. during open instead of probe).

   bcm43xx_net_open ->
      bcm43xx_init_board ->
         bcm43xx_select_wireless_core ->
            ieee80211softmac_start

Fix is to check that device is running before completing
ieee80211softmac_wx_get_rate.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff86a543
...@@ -265,6 +265,12 @@ ieee80211softmac_wx_get_rate(struct net_device *net_dev, ...@@ -265,6 +265,12 @@ ieee80211softmac_wx_get_rate(struct net_device *net_dev,
int err = -EINVAL; int err = -EINVAL;
spin_lock_irqsave(&mac->lock, flags); spin_lock_irqsave(&mac->lock, flags);
if (unlikely(!mac->running)) {
err = -ENODEV;
goto out_unlock;
}
switch (mac->txrates.default_rate) { switch (mac->txrates.default_rate) {
case IEEE80211_CCK_RATE_1MB: case IEEE80211_CCK_RATE_1MB:
data->bitrate.value = 1000000; data->bitrate.value = 1000000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment