Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mirror_ubuntu-artful-kernel.git] / net / x25 / x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index f099fd6a7c0ef2b34a6e92f1df24fb4b526a798a..848a6b6f90a658d98167916e3d118a1907df28ba 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -1,8 +1,8 @@
 /*
  *     X.25 Packet Layer release 002
  *
- *     This is ALPHA test software. This code may break your machine, randomly fail to work with new 
- *     releases, misbehave and/or generally screw up. It might even work. 
+ *     This is ALPHA test software. This code may break your machine, randomly fail to work with new
+ *     releases, misbehave and/or generally screw up. It might even work.
  *
  *     This code REQUIRES 2.1.15 or higher
  *
@@ -31,7 +31,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
        unsigned int lci;
 
        frametype = skb->data[2];
-        lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF);
+       lci = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF);
 
        /*
         *      LCI of zero is always for us, and its always a link control
@@ -48,7 +48,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
        if ((sk = x25_find_socket(lci, nb)) != NULL) {
                int queued = 1;
 
-               skb->h.raw = skb->data;
+               skb_reset_transport_header(skb);
                bh_lock_sock(sk);
                if (!sock_owned_by_user(sk)) {
                        queued = x25_process_rx_frame(sk, skb);
@@ -191,7 +191,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb)
 {
        unsigned char *dptr;
 
-       skb->nh.raw = skb->data;
+       skb_reset_network_header(skb);
 
        switch (nb->dev->type) {
                case ARPHRD_X25: