git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
bridge
/
netfilter
/
ebt_dnat.c
diff --git
a/net/bridge/netfilter/ebt_dnat.c
b/net/bridge/netfilter/ebt_dnat.c
index
f9552df
..
4582659
100644
(file)
--- a/
net/bridge/netfilter/ebt_dnat.c
+++ b/
net/bridge/netfilter/ebt_dnat.c
@@
-30,8
+30,7
@@
static int ebt_target_dnat(struct sk_buff **pskb, unsigned int hooknr,
kfree_skb(*pskb);
*pskb = nskb;
}
kfree_skb(*pskb);
*pskb = nskb;
}
- memcpy(((**pskb).mac.ethernet)->h_dest, info->mac,
- ETH_ALEN * sizeof(unsigned char));
+ memcpy(eth_hdr(*pskb)->h_dest, info->mac, ETH_ALEN);
return info->target;
}
return info->target;
}
@@
-62,16
+61,16
@@
static struct ebt_target dnat =
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_dnat_
init(void)
{
return ebt_register_target(&dnat);
}
{
return ebt_register_target(&dnat);
}
-static void __exit fini(void)
+static void __exit
ebt_dnat_
fini(void)
{
ebt_unregister_target(&dnat);
}
{
ebt_unregister_target(&dnat);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_dnat_
init);
+module_exit(
ebt_dnat_
fini);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");