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

Commit 822446d4 authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

mwifiex: check next packet length for usb tx aggregation 



The next packet length will be used by interface driver, to check if the
next packet still could be aggregated.

Signed-off-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a2ca85ad

drivers/net/wireless/marvell/mwifiex/11n_aggr.c

+6 −6
Original line number Diff line number Diff line
@@ -250,16 +250,16 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
		return 0;

	}



	if (adapter->iface_type == MWIFIEX_USB) {

		ret = adapter->if_ops.host_to_card(adapter, priv->usb_port,

						   skb_aggr, NULL);

	} else {

	if (skb_src)

			tx_param.next_pkt_len =

					skb_src->len + sizeof(struct txpd);

		tx_param.next_pkt_len = skb_src->len + sizeof(struct txpd);

	else

		tx_param.next_pkt_len = 0;



	if (adapter->iface_type == MWIFIEX_USB) {

		ret = adapter->if_ops.host_to_card(adapter, priv->usb_port,

						   skb_aggr, &tx_param);

	} else {



		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,

						   skb_aggr, &tx_param);

	}

drivers/net/wireless/marvell/mwifiex/txrx.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb, 
		if (adapter->iface_type == MWIFIEX_USB) {

			ret = adapter->if_ops.host_to_card(adapter,

							   priv->usb_port,

							   skb, NULL);

							   skb, tx_param);

		} else {

			ret = adapter->if_ops.host_to_card(adapter,

							   MWIFIEX_TYPE_DATA,
@@ -185,7 +185,7 @@ static int mwifiex_host_to_card(struct mwifiex_adapter *adapter, 
	if (adapter->iface_type == MWIFIEX_USB) {

		ret = adapter->if_ops.host_to_card(adapter,

						   priv->usb_port,

						   skb, NULL);

						   skb, tx_param);

	} else {

		ret = adapter->if_ops.host_to_card(adapter,

						   MWIFIEX_TYPE_DATA,

drivers/net/wireless/marvell/mwifiex/wmm.c

+4 −4
Original line number Diff line number Diff line
@@ -1363,13 +1363,13 @@ mwifiex_send_processed_packet(struct mwifiex_private *priv, 


	spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags);



	if (adapter->iface_type == MWIFIEX_USB) {

		ret = adapter->if_ops.host_to_card(adapter, priv->usb_port,

						   skb, NULL);

	} else {

	tx_param.next_pkt_len =

		((skb_next) ? skb_next->len +

		 sizeof(struct txpd) : 0);

	if (adapter->iface_type == MWIFIEX_USB) {

		ret = adapter->if_ops.host_to_card(adapter, priv->usb_port,

						   skb, &tx_param);

	} else {

		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,

						   skb, &tx_param);

	}