From f8ab73c2b25ddeb7a1d1301be1e80563b7fdd2b9 Mon Sep 17 00:00:00 2001 From: "Jorge Boncompte [DTI2]" Date: Mon, 21 Nov 2011 10:25:55 +0000 Subject: [PATCH] --- yaml --- r: 277927 b: refs/heads/master c: ada22aa563c5932242d9684e01a3f51b7ea08801 h: refs/heads/master i: 277925: bc6487ccac02b9c79dc7c2aac879c1f61fe4748d 277923: ea8c17fdf955cc7e23be344c0f65ffe8593d0d4d 277919: d4559c2f5f79264d6e3086e4c06c95c4c43f2e7e v: v3 --- [refs] | 2 +- trunk/net/atm/clip.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4e7e183471ae..70520136c0b7 100644 --- 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 index 32c41b8a803e..b3ab7ddc1185 100644 --- 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; }