diff options
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index d16cea770fa..f0582259c93 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c | |||
@@ -69,7 +69,7 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops, | |||
69 | 69 | ||
70 | adapter = kzalloc(sizeof(struct mwifiex_adapter), GFP_KERNEL); | 70 | adapter = kzalloc(sizeof(struct mwifiex_adapter), GFP_KERNEL); |
71 | if (!adapter) | 71 | if (!adapter) |
72 | return -1; | 72 | return -ENOMEM; |
73 | 73 | ||
74 | g_adapter = adapter; | 74 | g_adapter = adapter; |
75 | adapter->card = card; | 75 | adapter->card = card; |
@@ -150,7 +150,7 @@ error: | |||
150 | */ | 150 | */ |
151 | static int mwifiex_unregister(struct mwifiex_adapter *adapter) | 151 | static int mwifiex_unregister(struct mwifiex_adapter *adapter) |
152 | { | 152 | { |
153 | s32 i = 0; | 153 | s32 i; |
154 | 154 | ||
155 | del_timer(&adapter->cmd_timer); | 155 | del_timer(&adapter->cmd_timer); |
156 | 156 | ||
@@ -379,8 +379,7 @@ static void mwifiex_free_adapter(struct mwifiex_adapter *adapter) | |||
379 | */ | 379 | */ |
380 | static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter) | 380 | static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter) |
381 | { | 381 | { |
382 | int ret = 0; | 382 | int ret, err; |
383 | int err; | ||
384 | struct mwifiex_fw_image fw; | 383 | struct mwifiex_fw_image fw; |
385 | 384 | ||
386 | memset(&fw, 0, sizeof(struct mwifiex_fw_image)); | 385 | memset(&fw, 0, sizeof(struct mwifiex_fw_image)); |
@@ -449,7 +448,7 @@ done: | |||
449 | static void | 448 | static void |
450 | mwifiex_fill_buffer(struct sk_buff *skb) | 449 | mwifiex_fill_buffer(struct sk_buff *skb) |
451 | { | 450 | { |
452 | struct ethhdr *eth = NULL; | 451 | struct ethhdr *eth; |
453 | struct iphdr *iph; | 452 | struct iphdr *iph; |
454 | struct timeval tv; | 453 | struct timeval tv; |
455 | u8 tid = 0; | 454 | u8 tid = 0; |
@@ -510,20 +509,20 @@ static int | |||
510 | mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | 509 | mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) |
511 | { | 510 | { |
512 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 511 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
513 | struct sk_buff *new_skb = NULL; | 512 | struct sk_buff *new_skb; |
514 | struct mwifiex_txinfo *tx_info; | 513 | struct mwifiex_txinfo *tx_info; |
515 | 514 | ||
516 | dev_dbg(priv->adapter->dev, "data: %lu BSS(%d): Data <= kernel\n", | 515 | dev_dbg(priv->adapter->dev, "data: %lu BSS(%d): Data <= kernel\n", |
517 | jiffies, priv->bss_index); | 516 | jiffies, priv->bss_index); |
518 | 517 | ||
519 | if (priv->adapter->surprise_removed) { | 518 | if (priv->adapter->surprise_removed) { |
520 | kfree(skb); | 519 | kfree_skb(skb); |
521 | priv->stats.tx_dropped++; | 520 | priv->stats.tx_dropped++; |
522 | return 0; | 521 | return 0; |
523 | } | 522 | } |
524 | if (!skb->len || (skb->len > ETH_FRAME_LEN)) { | 523 | if (!skb->len || (skb->len > ETH_FRAME_LEN)) { |
525 | dev_err(priv->adapter->dev, "Tx: bad skb len %d\n", skb->len); | 524 | dev_err(priv->adapter->dev, "Tx: bad skb len %d\n", skb->len); |
526 | kfree(skb); | 525 | kfree_skb(skb); |
527 | priv->stats.tx_dropped++; | 526 | priv->stats.tx_dropped++; |
528 | return 0; | 527 | return 0; |
529 | } | 528 | } |
@@ -536,7 +535,7 @@ mwifiex_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
536 | skb_realloc_headroom(skb, MWIFIEX_MIN_DATA_HEADER_LEN); | 535 | skb_realloc_headroom(skb, MWIFIEX_MIN_DATA_HEADER_LEN); |
537 | if (unlikely(!new_skb)) { | 536 | if (unlikely(!new_skb)) { |
538 | dev_err(priv->adapter->dev, "Tx: cannot alloca new_skb\n"); | 537 | dev_err(priv->adapter->dev, "Tx: cannot alloca new_skb\n"); |
539 | kfree(skb); | 538 | kfree_skb(skb); |
540 | priv->stats.tx_dropped++; | 539 | priv->stats.tx_dropped++; |
541 | return 0; | 540 | return 0; |
542 | } | 541 | } |
@@ -571,7 +570,7 @@ mwifiex_set_mac_address(struct net_device *dev, void *addr) | |||
571 | { | 570 | { |
572 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); | 571 | struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev); |
573 | struct sockaddr *hw_addr = (struct sockaddr *) addr; | 572 | struct sockaddr *hw_addr = (struct sockaddr *) addr; |
574 | int ret = 0; | 573 | int ret; |
575 | 574 | ||
576 | memcpy(priv->curr_addr, hw_addr->sa_data, ETH_ALEN); | 575 | memcpy(priv->curr_addr, hw_addr->sa_data, ETH_ALEN); |
577 | 576 | ||
@@ -696,9 +695,9 @@ static struct mwifiex_private *mwifiex_add_interface( | |||
696 | struct mwifiex_adapter *adapter, | 695 | struct mwifiex_adapter *adapter, |
697 | u8 bss_index, u8 bss_type) | 696 | u8 bss_index, u8 bss_type) |
698 | { | 697 | { |
699 | struct net_device *dev = NULL; | 698 | struct net_device *dev; |
700 | struct mwifiex_private *priv = NULL; | 699 | struct mwifiex_private *priv; |
701 | void *mdev_priv = NULL; | 700 | void *mdev_priv; |
702 | 701 | ||
703 | dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), "mlan%d", | 702 | dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), "mlan%d", |
704 | ether_setup, 1); | 703 | ether_setup, 1); |
@@ -759,7 +758,7 @@ error: | |||
759 | static void | 758 | static void |
760 | mwifiex_remove_interface(struct mwifiex_adapter *adapter, u8 bss_index) | 759 | mwifiex_remove_interface(struct mwifiex_adapter *adapter, u8 bss_index) |
761 | { | 760 | { |
762 | struct net_device *dev = NULL; | 761 | struct net_device *dev; |
763 | struct mwifiex_private *priv = adapter->priv[bss_index]; | 762 | struct mwifiex_private *priv = adapter->priv[bss_index]; |
764 | 763 | ||
765 | if (!priv) | 764 | if (!priv) |