---

yaml --- r: 352466 b: refs/heads/master c: bd9e89f h: refs/heads/master v: v3
git-mirror · Feb 14, 2013 · ade458e · ade458e
1 parent e1a0c48
commit ade458e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b597d20d59b84f0fc3735de75c3efd6e6eb4365d
+refs/heads/master: bd9e89f29427f4accd62ce5dfe1547549f0d3fbc
diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c
@@ -2740,7 +2740,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
 	/* Send the packet up the stack */
 	ret = napi_gro_receive(napi, skb);
 
-	if (GRO_DROP == ret)
+	if (unlikely(GRO_DROP == ret))
 		atomic64_inc(&priv->extra_stats.kernel_dropped);
 
 	return 0;