git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
net
/
ipv6
/
netfilter
/
ip6t_eui64.c
diff --git
a/net/ipv6/netfilter/ip6t_eui64.c
b/net/ipv6/netfilter/ip6t_eui64.c
index
967bed7
..
0f3dd93
100644
(file)
--- a/
net/ipv6/netfilter/ip6t_eui64.c
+++ b/
net/ipv6/netfilter/ip6t_eui64.c
@@
-32,8
+32,8
@@
match(const struct sk_buff *skb,
unsigned char eui64[8];
int i = 0;
unsigned char eui64[8];
int i = 0;
- if (!(skb
->mac.raw
>= skb->head &&
- (skb
->mac.raw
+ ETH_HLEN) <= skb->data) &&
+ if (!(skb
_mac_header(skb)
>= skb->head &&
+ (skb
_mac_header(skb)
+ ETH_HLEN) <= skb->data) &&
offset != 0) {
*hotdrop = 1;
return 0;
offset != 0) {
*hotdrop = 1;
return 0;
@@
-42,7
+42,7
@@
match(const struct sk_buff *skb,
memset(eui64, 0, sizeof(eui64));
if (eth_hdr(skb)->h_proto == htons(ETH_P_IPV6)) {
memset(eui64, 0, sizeof(eui64));
if (eth_hdr(skb)->h_proto == htons(ETH_P_IPV6)) {
- if (
skb->nh.ipv6h
->version == 0x6) {
+ if (
ipv6_hdr(skb)
->version == 0x6) {
memcpy(eui64, eth_hdr(skb)->h_source, 3);
memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3);
eui64[3] = 0xff;
memcpy(eui64, eth_hdr(skb)->h_source, 3);
memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3);
eui64[3] = 0xff;
@@
-50,7
+50,7
@@
match(const struct sk_buff *skb,
eui64[0] |= 0x02;
i = 0;
eui64[0] |= 0x02;
i = 0;
- while ((
skb->nh.ipv6h->saddr.s6_addr[8+
i] == eui64[i])
+ while ((
ipv6_hdr(skb)->saddr.s6_addr[8 +
i] == eui64[i])
&& (i < 8))
i++;
&& (i < 8))
i++;