---

yaml --- r: 214334 b: refs/heads/master c: ebc872c h: refs/heads/master v: v3
git-mirror · Sep 7, 2010 · 37f1e52 · 37f1e52
1 parent 83230d8
commit 37f1e52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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,