Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 406a39ec authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

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: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f1a9c1e6

drivers/net/wireless/mwifiex/cmdevt.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

	}

}
@@ -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) {
@@ -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;

}

drivers/net/wireless/mwifiex/main.h

+0 −4
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mwifiex/util.c

+0 −25
Original line number Diff line number Diff line
@@ -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.

 *