diff options
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_dev.c | 4 | ||||
-rw-r--r-- | net/decnet/dn_neigh.c | 6 | ||||
-rw-r--r-- | net/decnet/dn_route.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 060d725e2942..95871a669dc4 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c | |||
@@ -913,7 +913,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa) | |||
913 | pktlen = (__le16 *)skb_push(skb,2); | 913 | pktlen = (__le16 *)skb_push(skb,2); |
914 | *pktlen = dn_htons(skb->len - 2); | 914 | *pktlen = dn_htons(skb->len - 2); |
915 | 915 | ||
916 | skb->nh.raw = skb->data; | 916 | skb_reset_network_header(skb); |
917 | 917 | ||
918 | dn_rt_finish_output(skb, dn_rt_all_rt_mcast, msg->id); | 918 | dn_rt_finish_output(skb, dn_rt_all_rt_mcast, msg->id); |
919 | } | 919 | } |
@@ -1005,7 +1005,7 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa) | |||
1005 | pktlen = (__le16 *)skb_push(skb, 2); | 1005 | pktlen = (__le16 *)skb_push(skb, 2); |
1006 | *pktlen = dn_htons(skb->len - 2); | 1006 | *pktlen = dn_htons(skb->len - 2); |
1007 | 1007 | ||
1008 | skb->nh.raw = skb->data; | 1008 | skb_reset_network_header(skb); |
1009 | 1009 | ||
1010 | if (dn_am_i_a_router(dn, dn_db, ifa)) { | 1010 | if (dn_am_i_a_router(dn, dn_db, ifa)) { |
1011 | struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC); | 1011 | struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC); |
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index bf701cf5a386..4bf066c416e2 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c | |||
@@ -261,7 +261,7 @@ static int dn_long_output(struct sk_buff *skb) | |||
261 | lp->s_class = 0; | 261 | lp->s_class = 0; |
262 | lp->pt = 0; | 262 | lp->pt = 0; |
263 | 263 | ||
264 | skb->nh.raw = skb->data; | 264 | skb_reset_network_header(skb); |
265 | 265 | ||
266 | return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet); | 266 | return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet); |
267 | } | 267 | } |
@@ -300,7 +300,7 @@ static int dn_short_output(struct sk_buff *skb) | |||
300 | sp->srcnode = cb->src; | 300 | sp->srcnode = cb->src; |
301 | sp->forward = cb->hops & 0x3f; | 301 | sp->forward = cb->hops & 0x3f; |
302 | 302 | ||
303 | skb->nh.raw = skb->data; | 303 | skb_reset_network_header(skb); |
304 | 304 | ||
305 | return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet); | 305 | return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet); |
306 | } | 306 | } |
@@ -342,7 +342,7 @@ static int dn_phase3_output(struct sk_buff *skb) | |||
342 | sp->srcnode = cb->src & dn_htons(0x03ff); | 342 | sp->srcnode = cb->src & dn_htons(0x03ff); |
343 | sp->forward = cb->hops & 0x3f; | 343 | sp->forward = cb->hops & 0x3f; |
344 | 344 | ||
345 | skb->nh.raw = skb->data; | 345 | skb_reset_network_header(skb); |
346 | 346 | ||
347 | return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet); | 347 | return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet); |
348 | } | 348 | } |
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index ef94ca56d7bd..34079b7ba1d3 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -615,7 +615,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type | |||
615 | flags = *skb->data; | 615 | flags = *skb->data; |
616 | } | 616 | } |
617 | 617 | ||
618 | skb->nh.raw = skb->data; | 618 | skb_reset_network_header(skb); |
619 | 619 | ||
620 | /* | 620 | /* |
621 | * Weed out future version DECnet | 621 | * Weed out future version DECnet |