diff options
Diffstat (limited to 'drivers/staging/ks7010/ks_wlan_net.c')
| -rw-r--r-- | drivers/staging/ks7010/ks_wlan_net.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c index 0f9348ba5d84..880085e2f24a 100644 --- a/drivers/staging/ks7010/ks_wlan_net.c +++ b/drivers/staging/ks7010/ks_wlan_net.c @@ -114,7 +114,7 @@ int ks_wlan_update_phy_information(struct ks_wlan_private *priv) } static -void ks_wlan_update_phyinfo_timeout(unsigned long ptr) +void ks_wlan_update_phyinfo_timeout(struct timer_list *unused) { DPRINTK(4, "in_interrupt = %ld\n", in_interrupt()); atomic_set(&update_phyinfo, 0); @@ -473,13 +473,16 @@ static int ks_wlan_set_rate(struct net_device *dev, priv->reg.rate_set.body[3] = TX_RATE_11M; i++; + /* fall through */ case 5500000: priv->reg.rate_set.body[2] = TX_RATE_5M; i++; + /* fall through */ case 2000000: priv->reg.rate_set.body[1] = TX_RATE_2M | BASIC_RATE; i++; + /* fall through */ case 1000000: priv->reg.rate_set.body[0] = TX_RATE_1M | BASIC_RATE; @@ -535,14 +538,17 @@ static int ks_wlan_set_rate(struct net_device *dev, priv->reg.rate_set.body[11] = TX_RATE_54M; i++; + /* fall through */ case 48000000: priv->reg.rate_set.body[10] = TX_RATE_48M; i++; + /* fall through */ case 36000000: priv->reg.rate_set.body[9] = TX_RATE_36M; i++; + /* fall through */ case 24000000: case 18000000: case 12000000: @@ -619,14 +625,17 @@ static int ks_wlan_set_rate(struct net_device *dev, TX_RATE_6M | BASIC_RATE; i++; } + /* fall through */ case 5500000: priv->reg.rate_set.body[2] = TX_RATE_5M | BASIC_RATE; i++; + /* fall through */ case 2000000: priv->reg.rate_set.body[1] = TX_RATE_2M | BASIC_RATE; i++; + /* fall through */ case 1000000: priv->reg.rate_set.body[0] = TX_RATE_1M | BASIC_RATE; @@ -2010,6 +2019,7 @@ static int ks_wlan_set_mlme(struct net_device *dev, case IW_MLME_DEAUTH: if (mlme->reason_code == WLAN_REASON_MIC_FAILURE) return 0; + /* fall through */ case IW_MLME_DISASSOC: mode = 1; return ks_wlan_set_stop_request(dev, NULL, &mode, NULL); @@ -2941,8 +2951,7 @@ int ks_wlan_net_start(struct net_device *dev) /* phy information update timer */ atomic_set(&update_phyinfo, 0); - setup_timer(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, - (unsigned long)priv); + timer_setup(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, 0); /* dummy address set */ memcpy(priv->eth_addr, dummy_addr, ETH_ALEN); |