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_snat.c

diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c
index ae0f053..cbb33e2 100644 (file)
--- a/net/bridge/netfilter/ebt_snat.c
+++ b/net/bridge/netfilter/ebt_snat.c
@@ -30,8 +30,7 @@ static int ebt_target_snat(struct sk_buff **pskb, unsigned int hooknr,
                kfree_skb(*pskb);
                *pskb = nskb;
        }
-       memcpy(((**pskb).mac.ethernet)->h_source, info->mac,
-          ETH_ALEN * sizeof(unsigned char));
+       memcpy(eth_hdr(*pskb)->h_source, info->mac, ETH_ALEN);
        return info->target;
 }
 
@@ -62,16 +61,16 @@ static struct ebt_target snat =
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init ebt_snat_init(void)
 {
        return ebt_register_target(&snat);
 }
 
-static void __exit fini(void)
+static void __exit ebt_snat_fini(void)
 {
        ebt_unregister_target(&snat);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ebt_snat_init);
+module_exit(ebt_snat_fini);
 MODULE_LICENSE("GPL");