diff options
Diffstat (limited to 'net/ax25/ax25_in.c')
-rw-r--r-- | net/ax25/ax25_in.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 6d11b0633d5a..3b2aac670266 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c | |||
@@ -61,8 +61,8 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb) | |||
61 | skb_reserve(skbn, AX25_MAX_HEADER_LEN); | 61 | skb_reserve(skbn, AX25_MAX_HEADER_LEN); |
62 | 62 | ||
63 | skbn->dev = ax25->ax25_dev->dev; | 63 | skbn->dev = ax25->ax25_dev->dev; |
64 | skb_reset_network_header(skbn); | ||
64 | skbn->h.raw = skbn->data; | 65 | skbn->h.raw = skbn->data; |
65 | skbn->nh.raw = skbn->data; | ||
66 | 66 | ||
67 | /* Copy data from the fragments */ | 67 | /* Copy data from the fragments */ |
68 | while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) { | 68 | while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) { |
@@ -123,7 +123,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) | |||
123 | 123 | ||
124 | skb_pull(skb, 1); /* Remove PID */ | 124 | skb_pull(skb, 1); /* Remove PID */ |
125 | skb_reset_mac_header(skb); | 125 | skb_reset_mac_header(skb); |
126 | skb->nh.raw = skb->data; | 126 | skb_reset_network_header(skb); |
127 | skb->dev = ax25->ax25_dev->dev; | 127 | skb->dev = ax25->ax25_dev->dev; |
128 | skb->pkt_type = PACKET_HOST; | 128 | skb->pkt_type = PACKET_HOST; |
129 | skb->protocol = htons(ETH_P_IP); | 129 | skb->protocol = htons(ETH_P_IP); |
@@ -247,7 +247,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, | |||
247 | case AX25_P_IP: | 247 | case AX25_P_IP: |
248 | skb_pull(skb,2); /* drop PID/CTRL */ | 248 | skb_pull(skb,2); /* drop PID/CTRL */ |
249 | skb->h.raw = skb->data; | 249 | skb->h.raw = skb->data; |
250 | skb->nh.raw = skb->data; | 250 | skb_reset_network_header(skb); |
251 | skb->dev = dev; | 251 | skb->dev = dev; |
252 | skb->pkt_type = PACKET_HOST; | 252 | skb->pkt_type = PACKET_HOST; |
253 | skb->protocol = htons(ETH_P_IP); | 253 | skb->protocol = htons(ETH_P_IP); |
@@ -257,7 +257,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, | |||
257 | case AX25_P_ARP: | 257 | case AX25_P_ARP: |
258 | skb_pull(skb,2); | 258 | skb_pull(skb,2); |
259 | skb->h.raw = skb->data; | 259 | skb->h.raw = skb->data; |
260 | skb->nh.raw = skb->data; | 260 | skb_reset_network_header(skb); |
261 | skb->dev = dev; | 261 | skb->dev = dev; |
262 | skb->pkt_type = PACKET_HOST; | 262 | skb->pkt_type = PACKET_HOST; |
263 | skb->protocol = htons(ETH_P_ARP); | 263 | skb->protocol = htons(ETH_P_ARP); |