diff options
Diffstat (limited to 'net/netrom')
-rw-r--r-- | net/netrom/af_netrom.c | 6 | ||||
-rw-r--r-- | net/netrom/nr_in.c | 2 | ||||
-rw-r--r-- | net/netrom/nr_loopback.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index a54e7ef2568a..8d0f30a015df 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
@@ -878,7 +878,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) | |||
878 | if (frametype == NR_PROTOEXT && | 878 | if (frametype == NR_PROTOEXT && |
879 | circuit_index == NR_PROTO_IP && circuit_id == NR_PROTO_IP) { | 879 | circuit_index == NR_PROTO_IP && circuit_id == NR_PROTO_IP) { |
880 | skb_pull(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN); | 880 | skb_pull(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN); |
881 | skb->h.raw = skb->data; | 881 | skb_reset_transport_header(skb); |
882 | 882 | ||
883 | return nr_rx_ip(skb, dev); | 883 | return nr_rx_ip(skb, dev); |
884 | } | 884 | } |
@@ -904,7 +904,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) | |||
904 | } | 904 | } |
905 | 905 | ||
906 | if (sk != NULL) { | 906 | if (sk != NULL) { |
907 | skb->h.raw = skb->data; | 907 | skb_reset_transport_header(skb); |
908 | 908 | ||
909 | if (frametype == NR_CONNACK && skb->len == 22) | 909 | if (frametype == NR_CONNACK && skb->len == 22) |
910 | nr_sk(sk)->bpqext = 1; | 910 | nr_sk(sk)->bpqext = 1; |
@@ -1149,7 +1149,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1149 | return er; | 1149 | return er; |
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | skb->h.raw = skb->data; | 1152 | skb_reset_transport_header(skb); |
1153 | copied = skb->len; | 1153 | copied = skb->len; |
1154 | 1154 | ||
1155 | if (copied > size) { | 1155 | if (copied > size) { |
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index 5560acbaaa95..e6dc749e14be 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c | |||
@@ -51,7 +51,7 @@ static int nr_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more) | |||
51 | if ((skbn = alloc_skb(nr->fraglen, GFP_ATOMIC)) == NULL) | 51 | if ((skbn = alloc_skb(nr->fraglen, GFP_ATOMIC)) == NULL) |
52 | return 1; | 52 | return 1; |
53 | 53 | ||
54 | skbn->h.raw = skbn->data; | 54 | skb_reset_transport_header(skbn); |
55 | 55 | ||
56 | while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) { | 56 | while ((skbo = skb_dequeue(&nr->frag_queue)) != NULL) { |
57 | memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); | 57 | memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len); |
diff --git a/net/netrom/nr_loopback.c b/net/netrom/nr_loopback.c index e856ae1b360a..99fdab16ded0 100644 --- a/net/netrom/nr_loopback.c +++ b/net/netrom/nr_loopback.c | |||
@@ -35,7 +35,7 @@ int nr_loopback_queue(struct sk_buff *skb) | |||
35 | 35 | ||
36 | if ((skbn = alloc_skb(skb->len, GFP_ATOMIC)) != NULL) { | 36 | if ((skbn = alloc_skb(skb->len, GFP_ATOMIC)) != NULL) { |
37 | memcpy(skb_put(skbn, skb->len), skb->data, skb->len); | 37 | memcpy(skb_put(skbn, skb->len), skb->data, skb->len); |
38 | skbn->h.raw = skbn->data; | 38 | skb_reset_transport_header(skbn); |
39 | 39 | ||
40 | skb_queue_tail(&loopback_queue, skbn); | 40 | skb_queue_tail(&loopback_queue, skbn); |
41 | 41 | ||