forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SK_BUFF]: Use the helpers to get the layer header pointer

Browse source 
Some more cases...

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-03-16 17:19:57 -03:00 • committed by David S. Miller
parent 514bca322c
commit bff9b61ce3
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/ipv4/igmp.c
View file

@ -348,7 +348,7 @@ static int igmpv3_sendpack(struct sk_buff *skb)
{ {
struct iphdr *pip = ip_hdr(skb); struct iphdr *pip = ip_hdr(skb);
struct igmphdr *pig = igmp_hdr(skb); struct igmphdr *pig = igmp_hdr(skb);
const int iplen = skb->tail - skb->nh.raw; const int iplen = skb->tail - skb_network_header(skb);
const int igmplen = skb->tail - skb_transport_header(skb); const int igmplen = skb->tail - skb_transport_header(skb);
pip->tot_len = htons(iplen); pip->tot_len = htons(iplen);

2
net/ipv4/ip_output.c
View file

@ -601,7 +601,7 @@ slow_path:
/* /*
* Copy a block of the IP datagram. * Copy a block of the IP datagram.
*/ */
if (skb_copy_bits(skb, ptr, skb2->h.raw, len)) if (skb_copy_bits(skb, ptr, skb_transport_header(skb2), len))
BUG(); BUG();
left -= len; left -= len;

2
net/ipv6/exthdrs.c
View file

@ -506,7 +506,7 @@ looped_back:
kfree_skb(skb); kfree_skb(skb);
*skbp = skb = skb2; *skbp = skb = skb2;
opt = IP6CB(skb2); opt = IP6CB(skb2);
hdr = (struct ipv6_rt_hdr *) skb2->h.raw; hdr = (struct ipv6_rt_hdr *)skb_transport_header(skb2);
} }
if (skb->ip_summed == CHECKSUM_COMPLETE) if (skb->ip_summed == CHECKSUM_COMPLETE)

4
net/ipv6/netfilter/nf_conntrack_reasm.c
View file

@ -627,7 +627,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
/* We have to remove fragment header from datagram and to relocate /* We have to remove fragment header from datagram and to relocate
* header in order to calculate ICV correctly. */ * header in order to calculate ICV correctly. */
skb_network_header(head)[fq->nhoffset] = head->h.raw[0]; skb_network_header(head)[fq->nhoffset] = skb_transport_header(head)[0];
memmove(head->head + sizeof(struct frag_hdr), head->head, memmove(head->head + sizeof(struct frag_hdr), head->head,
(head->data - head->head) - sizeof(struct frag_hdr)); (head->data - head->head) - sizeof(struct frag_hdr));
head->mac.raw += sizeof(struct frag_hdr); head->mac.raw += sizeof(struct frag_hdr);
@ -787,7 +787,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
skb_set_transport_header(clone, fhoff); skb_set_transport_header(clone, fhoff);
hdr = ipv6_hdr(clone); hdr = ipv6_hdr(clone);
fhdr = (struct frag_hdr *)clone->h.raw; fhdr = (struct frag_hdr *)skb_transport_header(clone);
if (!(fhdr->frag_off & htons(0xFFF9))) { if (!(fhdr->frag_off & htons(0xFFF9))) {
DEBUGP("Invalid fragment offset\n"); DEBUGP("Invalid fragment offset\n");