mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
e2d1bca7e6
commit
7e28ecc282
5 changed files with 24 additions and 8 deletions
|
|
@ -576,7 +576,9 @@ static struct sk_buff *ipxitf_adjust_skbuff(struct ipx_interface *intrfc,
|
|||
skb2 = alloc_skb(len, GFP_ATOMIC);
|
||||
if (skb2) {
|
||||
skb_reserve(skb2, out_offset);
|
||||
skb2->nh.raw = skb2->h.raw = skb_put(skb2, skb->len);
|
||||
skb_reset_network_header(skb2);
|
||||
skb2->h.raw = skb2->data;
|
||||
skb_put(skb2, skb->len);
|
||||
memcpy(ipx_hdr(skb2), ipx_hdr(skb), skb->len);
|
||||
memcpy(skb2->cb, skb->cb, sizeof(skb->cb));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -203,7 +203,9 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
|
|||
skb->sk = sk;
|
||||
|
||||
/* Fill in IPX header */
|
||||
skb->h.raw = skb->nh.raw = skb_put(skb, sizeof(struct ipxhdr));
|
||||
skb_reset_network_header(skb);
|
||||
skb->h.raw = skb->data;
|
||||
skb_put(skb, sizeof(struct ipxhdr));
|
||||
ipx = ipx_hdr(skb);
|
||||
ipx->ipx_pktsize = htons(len + sizeof(struct ipxhdr));
|
||||
IPX_SKB_CB(skb)->ipx_tctrl = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue