diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/802/psnap.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/802/psnap.c')
| -rw-r--r-- | net/802/psnap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/802/psnap.c b/net/802/psnap.c index 34e42968b477..270b9d2cae65 100644 --- a/net/802/psnap.c +++ b/net/802/psnap.c | |||
| @@ -59,10 +59,8 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev, | |||
| 59 | proto = find_snap_client(skb->h.raw); | 59 | proto = find_snap_client(skb->h.raw); |
| 60 | if (proto) { | 60 | if (proto) { |
| 61 | /* Pass the frame on. */ | 61 | /* Pass the frame on. */ |
| 62 | u8 *hdr = skb->data; | ||
| 63 | skb->h.raw += 5; | 62 | skb->h.raw += 5; |
| 64 | skb_pull(skb, 5); | 63 | skb_pull_rcsum(skb, 5); |
| 65 | skb_postpull_rcsum(skb, hdr, 5); | ||
| 66 | rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev); | 64 | rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev); |
| 67 | } else { | 65 | } else { |
| 68 | skb->sk = NULL; | 66 | skb->sk = NULL; |
