diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 09:49:01 -0500 |
| commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
| tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /drivers/net/pppoe.c | |
| parent | e3bd9ec5d8bfc90f9e1bd995677829e57a404061 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'drivers/net/pppoe.c')
| -rw-r--r-- | drivers/net/pppoe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index fc6f4b8c64b3..b646e92134dc 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
| @@ -399,11 +399,11 @@ static int pppoe_rcv(struct sk_buff *skb, | |||
| 399 | if (skb->len < len) | 399 | if (skb->len < len) |
| 400 | goto drop; | 400 | goto drop; |
| 401 | 401 | ||
| 402 | po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex); | 402 | if (pskb_trim_rcsum(skb, len)) |
| 403 | if (!po) | ||
| 404 | goto drop; | 403 | goto drop; |
| 405 | 404 | ||
| 406 | if (pskb_trim_rcsum(skb, len)) | 405 | po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex); |
| 406 | if (!po) | ||
| 407 | goto drop; | 407 | goto drop; |
| 408 | 408 | ||
| 409 | return sk_receive_skb(sk_pppox(po), skb, 0); | 409 | return sk_receive_skb(sk_pppox(po), skb, 0); |