dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[SK_BUFF] ipv6: Use skb_network_offset in some more places 

So that we reduce the number of direct accesses to skb->data.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-03-19 22:29:03 -03:00 committed by David S. Miller
parent dc5fc579b9
commit 6b88dd966b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/netfilter/ip6_tables.c
View File

@ -1448,7 +1448,7 @@ static void __exit ip6_tables_fini(void)
int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
int target, unsigned short *fragoff)
{
unsigned int start = (u8 *)(ipv6_hdr(skb) + 1) - skb->data;
unsigned int start = skb_network_offset(skb) + sizeof(struct ipv6hdr);
u8 nexthdr = ipv6_hdr(skb)->nexthdr;
unsigned int len = skb->len - start;

5
net/ipv6/netfilter/nf_conntrack_reasm.c
View File

@ -707,8 +707,9 @@ static int
find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
{
u8 nexthdr = ipv6_hdr(skb)->nexthdr;
u8 prev_nhoff = (u8 *)&ipv6_hdr(skb)->nexthdr - skb->data;
int start = (u8 *)(ipv6_hdr(skb) + 1) - skb->data;
const int netoff = skb_network_offset(skb);
u8 prev_nhoff = netoff + offsetof(struct ipv6hdr, nexthdr);
int start = netoff + sizeof(struct ipv6hdr);
int len = skb->len - start;
u8 prevhdr = NEXTHDR_IPV6;