Skip to content

Commit

Permalink
mwifiex: remove mwifiex_recv_complete function
Browse files Browse the repository at this point in the history
The function
- increments dropped rx_packet count if status code
  passed to it is "-1".
- frees SKB buffer.

But currently the function is being called with "0" status code.
This patch replaces above function by dev_kfree_skb_any() call.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Amitkumar Karwar authored and John W. Linville committed May 12, 2011
1 parent f1a9c1e commit 406a39e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 32 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/mwifiex/cmdevt.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mwifiex_clean_cmd_node(struct mwifiex_adapter *adapter,
cmd_node->wait_q_enabled = false;

if (cmd_node->resp_skb) {
mwifiex_recv_complete(adapter, cmd_node->resp_skb, 0);
dev_kfree_skb_any(cmd_node->resp_skb);
cmd_node->resp_skb = NULL;
}
}
Expand Down Expand Up @@ -339,7 +339,7 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter)
}
if (!cmd_array[i].resp_skb)
continue;
mwifiex_recv_complete(adapter, cmd_array[i].resp_skb, 0);
dev_kfree_skb_any(cmd_array[i].resp_skb);
}
/* Release struct cmd_ctrl_node */
if (adapter->cmd_pool) {
Expand Down Expand Up @@ -402,7 +402,7 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter)
adapter->event_cause = 0;
adapter->event_skb = NULL;

mwifiex_recv_complete(adapter, skb, 0);
dev_kfree_skb_any(skb);

return ret;
}
Expand Down
4 changes: 0 additions & 4 deletions drivers/net/wireless/mwifiex/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -692,10 +692,6 @@ int mwifiex_shutdown_fw_complete(struct mwifiex_adapter *adapter);

int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *);

int mwifiex_recv_complete(struct mwifiex_adapter *,
struct sk_buff *skb,
int status);

int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb);

int mwifiex_process_event(struct mwifiex_adapter *adapter);
Expand Down
25 changes: 0 additions & 25 deletions drivers/net/wireless/mwifiex/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,31 +176,6 @@ int mwifiex_recv_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb)
return 0;
}

/*
* Receive packet completion callback handler.
*
* This function updates the statistics and frees the buffer SKB.
*/
int mwifiex_recv_complete(struct mwifiex_adapter *adapter,
struct sk_buff *skb, int status)
{
struct mwifiex_private *priv;
struct mwifiex_rxinfo *rx_info;

if (!skb)
return 0;

rx_info = MWIFIEX_SKB_RXCB(skb);
priv = mwifiex_bss_index_to_priv(adapter, rx_info->bss_index);

if (priv && (status == -1))
priv->stats.rx_dropped++;

dev_kfree_skb_any(skb);

return 0;
}

/*
* IOCTL completion callback handler.
*
Expand Down

0 comments on commit 406a39e

Please sign in to comment.