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

Commit 5910906c authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Refactor TPA code path. 



Call tcp_gro_complete() in the common code path instead of the chip-
specific method.  The newer 5731x method is missing the call.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcmo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68515a18

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+2 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,6 @@ static struct sk_buff *bnxt_gro_func_5730x(struct bnxt_tpa_info *tpa_info, 
		dev_kfree_skb_any(skb);

		return NULL;

	}

	tcp_gro_complete(skb);



	if (nw_off) { /* tunnel */

		struct udphdr *uh = NULL;
@@ -1177,6 +1176,8 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt *bp, 
		       RX_TPA_END_CMP_PAYLOAD_OFFSET) >>

		      RX_TPA_END_CMP_PAYLOAD_OFFSET_SHIFT;

	skb = bp->gro_func(tpa_info, payload_off, TPA_END_GRO_TS(tpa_end), skb);

	if (likely(skb))

		tcp_gro_complete(skb);

#endif

	return skb;

}