diff options
author | Amitkumar Karwar <akarwar@marvell.com> | 2011-05-11 22:47:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-12 14:10:50 -0400 |
commit | 406a39ec00992090cda034625e176504eb7a71f9 (patch) | |
tree | 18fe8059db8e714e1ec9bb8308177b4af1d8c634 /drivers/net/wireless/mwifiex | |
parent | f1a9c1e694f84938e6526590d23e88a791a8069f (diff) |
mwifiex: remove mwifiex_recv_complete function
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/cmdevt.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/util.c | 25 |
3 files changed, 3 insertions, 32 deletions
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c index 5c7539932c27..cd89fed206ae 100644 --- a/drivers/net/wireless/mwifiex/cmdevt.c +++ b/drivers/net/wireless/mwifiex/cmdevt.c | |||
@@ -91,7 +91,7 @@ mwifiex_clean_cmd_node(struct mwifiex_adapter *adapter, | |||
91 | cmd_node->wait_q_enabled = false; | 91 | cmd_node->wait_q_enabled = false; |
92 | 92 | ||
93 | if (cmd_node->resp_skb) { | 93 | if (cmd_node->resp_skb) { |
94 | mwifiex_recv_complete(adapter, cmd_node->resp_skb, 0); | 94 | dev_kfree_skb_any(cmd_node->resp_skb); |
95 | cmd_node->resp_skb = NULL; | 95 | cmd_node->resp_skb = NULL; |
96 | } | 96 | } |
97 | } | 97 | } |
@@ -339,7 +339,7 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter) | |||
339 | } | 339 | } |
340 | if (!cmd_array[i].resp_skb) | 340 | if (!cmd_array[i].resp_skb) |
341 | continue; | 341 | continue; |
342 | mwifiex_recv_complete(adapter, cmd_array[i].resp_skb, 0); | 342 | dev_kfree_skb_any(cmd_array[i].resp_skb); |
343 | } | 343 | } |
344 | /* Release struct cmd_ctrl_node */ | 344 | /* Release struct cmd_ctrl_node */ |
345 | if (adapter->cmd_pool) { | 345 | if (adapter->cmd_pool) { |
@@ -402,7 +402,7 @@ int mwifiex_process_event(struct mwifiex_adapter *adapter) | |||
402 | adapter->event_cause = 0; | 402 | adapter->event_cause = 0; |
403 | adapter->event_skb = NULL; | 403 | adapter->event_skb = NULL; |
404 | 404 | ||
405 | mwifiex_recv_complete(adapter, skb, 0); | 405 | dev_kfree_skb_any(skb); |
406 | 406 | ||
407 | return ret; | 407 | return ret; |
408 | } | 408 | } |
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index b4bb5ec4723e..672701dc2721 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -692,10 +692,6 @@ int mwifiex_shutdown_fw_complete(struct mwifiex_adapter *adapter); | |||
692 | 692 | ||
693 | int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *); | 693 | int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *); |
694 | 694 | ||
695 | int mwifiex_recv_complete(struct mwifiex_adapter *, | ||
696 | struct sk_buff *skb, | ||
697 | int status); | ||
698 | |||
699 | int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb); | 695 | int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb); |
700 | 696 | ||
701 | int mwifiex_process_event(struct mwifiex_adapter *adapter); | 697 | int mwifiex_process_event(struct mwifiex_adapter *adapter); |
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c index a8d53aa7e38d..d41291529bc0 100644 --- a/drivers/net/wireless/mwifiex/util.c +++ b/drivers/net/wireless/mwifiex/util.c | |||
@@ -177,31 +177,6 @@ int mwifiex_recv_packet(struct mwifiex_adapter *adapter, struct sk_buff *skb) | |||
177 | } | 177 | } |
178 | 178 | ||
179 | /* | 179 | /* |
180 | * Receive packet completion callback handler. | ||
181 | * | ||
182 | * This function updates the statistics and frees the buffer SKB. | ||
183 | */ | ||
184 | int mwifiex_recv_complete(struct mwifiex_adapter *adapter, | ||
185 | struct sk_buff *skb, int status) | ||
186 | { | ||
187 | struct mwifiex_private *priv; | ||
188 | struct mwifiex_rxinfo *rx_info; | ||
189 | |||
190 | if (!skb) | ||
191 | return 0; | ||
192 | |||
193 | rx_info = MWIFIEX_SKB_RXCB(skb); | ||
194 | priv = mwifiex_bss_index_to_priv(adapter, rx_info->bss_index); | ||
195 | |||
196 | if (priv && (status == -1)) | ||
197 | priv->stats.rx_dropped++; | ||
198 | |||
199 | dev_kfree_skb_any(skb); | ||
200 | |||
201 | return 0; | ||
202 | } | ||
203 | |||
204 | /* | ||
205 | * IOCTL completion callback handler. | 180 | * IOCTL completion callback handler. |
206 | * | 181 | * |
207 | * This function is called when a pending IOCTL is completed. | 182 | * This function is called when a pending IOCTL is completed. |