diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-10 16:40:59 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:48 -0400 |
commit | 7e28ecc282574a7d72ace365fc9bc86e27ba880f (patch) | |
tree | 6321d16c591694d6405b723f7bea80855b8040ce /net/ipx/ipx_route.c | |
parent | e2d1bca7e6134671bcb19810d004a252aa6a644d (diff) |
[SK_BUFF]: Use skb_reset_network_header where the skb_pull return was being used
But only in the cases where its a newly allocated skb, i.e. one where skb->tail
is equal to skb->data, or just after skb_reserve, where this requirement is
maintained.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx/ipx_route.c')
-rw-r--r-- | net/ipx/ipx_route.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c index 8e1cad971f11..e8277f544e72 100644 --- a/net/ipx/ipx_route.c +++ b/net/ipx/ipx_route.c | |||
@@ -203,7 +203,9 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx, | |||
203 | skb->sk = sk; | 203 | skb->sk = sk; |
204 | 204 | ||
205 | /* Fill in IPX header */ | 205 | /* Fill in IPX header */ |
206 | skb->h.raw = skb->nh.raw = skb_put(skb, sizeof(struct ipxhdr)); | 206 | skb_reset_network_header(skb); |
207 | skb->h.raw = skb->data; | ||
208 | skb_put(skb, sizeof(struct ipxhdr)); | ||
207 | ipx = ipx_hdr(skb); | 209 | ipx = ipx_hdr(skb); |
208 | ipx->ipx_pktsize = htons(len + sizeof(struct ipxhdr)); | 210 | ipx->ipx_pktsize = htons(len + sizeof(struct ipxhdr)); |
209 | IPX_SKB_CB(skb)->ipx_tctrl = 0; | 211 | IPX_SKB_CB(skb)->ipx_tctrl = 0; |