summaryrefslogtreecommitdiffstats
path: root/net/802/psnap.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-30 12:38:01 +1000
committerPaul Mackerras <paulus@samba.org>2007-04-30 12:38:01 +1000
commit49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch)
tree253801ebf57e0a23856a2c7be129c2c178f62fdf /net/802/psnap.c
parent34f6d749c0a328817d5e36274e53121c1db734dc (diff)
parentb9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff)
downloadop-kernel-dev-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.zip
op-kernel-dev-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.tar.gz
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'net/802/psnap.c')
-rw-r--r--net/802/psnap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 6e7c212..04ee43e 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -56,10 +56,10 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
};
rcu_read_lock();
- proto = find_snap_client(skb->h.raw);
+ proto = find_snap_client(skb_transport_header(skb));
if (proto) {
/* Pass the frame on. */
- skb->h.raw += 5;
+ skb->transport_header += 5;
skb_pull_rcsum(skb, 5);
rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);
} else {
OpenPOWER on IntegriCloud