Re: [PATCH v3 6/6] mwifiex: check next packet length for usb tx aggregation
From: Brian Norris <briannorris@chromium.org>
Date: 2017-05-19 16:28:59
On Fri, May 19, 2017 at 09:06:45AM +0000, Xinming Hu wrote:
quoted hunk ↗ jump to hunk
From: Xinming Hu <redacted> The next packet length will be used by interface driver, to check if the next packet still could be aggregated. Signed-off-by: Xinming Hu <redacted> Signed-off-by: Cathy Luo <redacted> Signed-off-by: Ganapathi Bhat <redacted> --- v3: same as v1,v2 --- drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 8 ++++---- drivers/net/wireless/marvell/mwifiex/txrx.c | 4 ++-- drivers/net/wireless/marvell/mwifiex/wmm.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c index cbf3bc2..8041f2d 100644 --- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c@@ -254,15 +254,15 @@ 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); else tx_param.next_pkt_len = 0;
The above if/else is now improperly indented.
+ 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);[...] Brian