From 37f1e52f910b1c92993c1b9a6d194b2a0f02906c Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Sun, 5 Sep 2010 22:20:11 +0000 Subject: [PATCH] --- yaml --- r: 214334 b: refs/heads/master c: ebc872c7bd7155bcc7db2343155729d13bf4a2ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_rx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9e08fab718f9..5a05fc9a193e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6c9322c3a0cd50a6996094327347c87cd2f4bd8 +refs/heads/master: ebc872c7bd7155bcc7db2343155729d13bf4a2ee diff --git a/trunk/drivers/net/mlx4/en_rx.c b/trunk/drivers/net/mlx4/en_rx.c index c4aad7f2beb9..570f2508fb30 100644 --- a/trunk/drivers/net/mlx4/en_rx.c +++ b/trunk/drivers/net/mlx4/en_rx.c @@ -591,6 +591,8 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud * - not an IP fragment */ if (dev->features & NETIF_F_GRO) { struct sk_buff *gro_skb = napi_get_frags(&cq->napi); + if (!gro_skb) + goto next; nr = mlx4_en_complete_rx_desc( priv, rx_desc,