diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 20:54:47 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:14 -0400 |
commit | 0660e03f6b18f19b6bbafe7583265a51b90daf36 (patch) | |
tree | 82cc819ead5ab7858ba211ee8719a3e6d2bb984f /net/ipv6/netfilter/ip6t_eui64.c | |
parent | d0a92be05ed4aea7d35c2b257e3f9173565fe4eb (diff) |
[SK_BUFF]: Introduce ipv6_hdr(), remove skb->nh.ipv6h
Now the skb->nh union has just one member, .raw, i.e. it is just like the
skb->mac union, strange, no? I'm just leaving it like that till the transport
layer is done with, when we'll rename skb->mac.raw to skb->mac_header (or
->mac_header_offset?), ditto for ->{h,nh}.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter/ip6t_eui64.c')
-rw-r--r-- | net/ipv6/netfilter/ip6t_eui64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c index c2676066a80..0f3dd932f0a 100644 --- a/net/ipv6/netfilter/ip6t_eui64.c +++ b/net/ipv6/netfilter/ip6t_eui64.c | |||
@@ -42,7 +42,7 @@ match(const struct sk_buff *skb, | |||
42 | memset(eui64, 0, sizeof(eui64)); | 42 | memset(eui64, 0, sizeof(eui64)); |
43 | 43 | ||
44 | if (eth_hdr(skb)->h_proto == htons(ETH_P_IPV6)) { | 44 | if (eth_hdr(skb)->h_proto == htons(ETH_P_IPV6)) { |
45 | if (skb->nh.ipv6h->version == 0x6) { | 45 | if (ipv6_hdr(skb)->version == 0x6) { |
46 | memcpy(eui64, eth_hdr(skb)->h_source, 3); | 46 | memcpy(eui64, eth_hdr(skb)->h_source, 3); |
47 | memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3); | 47 | memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3); |
48 | eui64[3] = 0xff; | 48 | eui64[3] = 0xff; |
@@ -50,7 +50,7 @@ match(const struct sk_buff *skb, | |||
50 | eui64[0] |= 0x02; | 50 | eui64[0] |= 0x02; |
51 | 51 | ||
52 | i = 0; | 52 | i = 0; |
53 | while ((skb->nh.ipv6h->saddr.s6_addr[8+i] == eui64[i]) | 53 | while ((ipv6_hdr(skb)->saddr.s6_addr[8 + i] == eui64[i]) |
54 | && (i < 8)) | 54 | && (i < 8)) |
55 | i++; | 55 | i++; |
56 | 56 | ||