diff options
| author | Michael Chan | 2016-12-29 18:13:35 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-12-29 20:37:23 +0100 |
| commit | 5910906ca9ee32943f67db24917f78a9ad1087db (patch) | |
| tree | 854e6f5c17dbfd71bc1c06e83ef2cd12755b6d76 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | bnxt_en: Fix and clarify link_info->advertising. (diff) | |
| download | kernel-qcow2-linux-5910906ca9ee32943f67db24917f78a9ad1087db.tar.gz kernel-qcow2-linux-5910906ca9ee32943f67db24917f78a9ad1087db.tar.xz kernel-qcow2-linux-5910906ca9ee32943f67db24917f78a9ad1087db.zip | |
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: Michael Chan <michael.chan@broadcmo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 4a8059fcc858..0654c3f32cea 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -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; } |