bnxt_en: Don't treat single segment rx frames as GRO frames.
authorMichael Chan <mchan@broadcom.com>
Sun, 27 Dec 2015 23:19:23 +0000 (18:19 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Dec 2015 05:57:28 +0000 (00:57 -0500)
If hardware completes single segment rx frames, don't bother setting
up all the GRO related fields.  Pass the SKB up as a normal frame.

Reviewed-by: vasundhara volam <vvolam@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 06ce100f3c549789bc95db288d39d18765c392b2..082c1e95edc7a019f532625a673453ff46b71982 100644 (file)
@@ -856,8 +856,13 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info,
        struct tcphdr *th;
        int payload_off, tcp_opt_len = 0;
        int len, nw_off;
+       u16 segs;
 
-       NAPI_GRO_CB(skb)->count = TPA_END_TPA_SEGS(tpa_end);
+       segs = TPA_END_TPA_SEGS(tpa_end);
+       if (segs == 1)
+               return skb;
+
+       NAPI_GRO_CB(skb)->count = segs;
        skb_shinfo(skb)->gso_size =
                le32_to_cpu(tpa_end1->rx_tpa_end_cmp_seg_len);
        skb_shinfo(skb)->gso_type = tpa_info->gso_type;