diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/net/pppoe.c | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/net/pppoe.c')
| -rw-r--r-- | drivers/net/pppoe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index 0adee733b761..315d5c3fc66a 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
| @@ -393,7 +393,7 @@ static int pppoe_rcv(struct sk_buff *skb, | |||
| 393 | 393 | ||
| 394 | po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source); | 394 | po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source); |
| 395 | if (po != NULL) | 395 | if (po != NULL) |
| 396 | return sk_receive_skb(sk_pppox(po), skb); | 396 | return sk_receive_skb(sk_pppox(po), skb, 0); |
| 397 | drop: | 397 | drop: |
| 398 | kfree_skb(skb); | 398 | kfree_skb(skb); |
| 399 | out: | 399 | out: |