diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-11 15:30:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-11 15:30:34 -0400 |
| commit | d122179a3c0fdc71b88cb9e3605f372b1651a9ff (patch) | |
| tree | 63a48b333e7565967b6d7c9e246557bfcb9f225f /net/atm | |
| parent | 419c20465d6319274e7286f0966e2390540e6e0a (diff) | |
| parent | b00916b189d13a615ff05c9242201135992fcda3 (diff) | |
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) | |||
| 778 | eg->packets_rcvd++; | 778 | eg->packets_rcvd++; |
| 779 | mpc->eg_ops->put(eg); | 779 | mpc->eg_ops->put(eg); |
| 780 | 780 | ||
| 781 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); | 781 | memset(ATM_SKB(new_skb), 0, sizeof(struct atm_skb_data)); |
| 782 | netif_rx(new_skb); | 782 | netif_rx(new_skb); |
| 783 | } | 783 | } |
| 784 | 784 | ||