---

yaml --- r: 277927 b: refs/heads/master c: ada22aa h: refs/heads/master i: 277925: bc6487c 277923: ea8c17f 277919: d4559c2 v: v3
git-mirror · Nov 22, 2011 · f8ab73c · f8ab73c
1 parent 4dba8d0
commit f8ab73c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe685b80469996149ca28c74062f72b5879c1607
+refs/heads/master: ada22aa563c5932242d9684e01a3f51b7ea08801
diff --git a/trunk/net/atm/clip.c b/trunk/net/atm/clip.c
@@ -484,16 +484,8 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout)
 		if (!clip_devs) {
 			atm_return(vcc, skb->truesize);
 			kfree_skb(skb);
-		} else {
-			struct net_device *dev = skb->dev;
-			unsigned int len = skb->len;
-
-			skb_get(skb);
+		} else
 			clip_push(vcc, skb);
-			dev->stats.rx_packets--;
-			dev->stats.rx_bytes -= len;
-			kfree_skb(skb);
-		}
 	}
 	return 0;
 }