diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-10-11 12:30:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-11 12:30:34 -0700 |
| commit | d122179a3c0fdc71b88cb9e3605f372b1651a9ff (patch) | |
| tree | 63a48b333e7565967b6d7c9e246557bfcb9f225f /net/atm | |
| parent | NET: pch, fix use after free (diff) | |
| parent | net: clear heap allocations for privileged ethtool actions (diff) | |
| download | linux-dev-d122179a3c0fdc71b88cb9e3605f372b1651a9ff.tar.xz linux-dev-d122179a3c0fdc71b88cb9e3605f372b1651a9ff.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/ethtool.c
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/mpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 622b471e14e0..74bcc662c3dd 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -778,7 +778,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) eg->packets_rcvd++; mpc->eg_ops->put(eg); - memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); + memset(ATM_SKB(new_skb), 0, sizeof(struct atm_skb_data)); netif_rx(new_skb); } |