Merge branch 'upstream' into upstream-jgarzik

[linux-2.6-omap-h63xx.git] / net / 802 / psnap.c

diff --git a/net/802/psnap.c b/net/802/psnap.c
index 4d638944d933bf971c7750425474dfd3079360eb..6e7c2120b83ff6a678ca0e3e33f377b713a711cf 100644 (file)
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -60,7 +60,7 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
        if (proto) {
                /* Pass the frame on. */
                skb->h.raw  += 5;
-               skb_pull(skb, 5);
+               skb_pull_rcsum(skb, 5);
                rc = proto->rcvfunc(skb, dev, &snap_packet_type, orig_dev);
        } else {
                skb->sk = NULL;
@@ -117,7 +117,7 @@ module_exit(snap_exit);
  */
 struct datalink_proto *register_snap_client(unsigned char *desc,
                                            int (*rcvfunc)(struct sk_buff *,
-                                                          struct net_device *,
+                                                          struct net_device *,
                                                           struct packet_type *,
                                                           struct net_device *))
 {