fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / bridge / netfilter / ebt_redirect.c

diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c
index befbfa1..9f378ea 100644 (file)
--- a/net/bridge/netfilter/ebt_redirect.c
+++ b/net/bridge/netfilter/ebt_redirect.c
@@ -32,11 +32,10 @@ static int ebt_target_redirect(struct sk_buff **pskb, unsigned int hooknr,
                *pskb = nskb;
        }
        if (hooknr != NF_BR_BROUTING)
-               memcpy((**pskb).mac.ethernet->h_dest,
-                  in->br_port->br->dev->dev_addr, ETH_ALEN);
+               memcpy(eth_hdr(*pskb)->h_dest,
+                      in->br_port->br->dev->dev_addr, ETH_ALEN);
        else
-               memcpy((**pskb).mac.ethernet->h_dest,
-                  in->dev_addr, ETH_ALEN);
+               memcpy(eth_hdr(*pskb)->h_dest, in->dev_addr, ETH_ALEN);
        (*pskb)->pkt_type = PACKET_HOST;
        return info->target;
 }
@@ -67,16 +66,16 @@ static struct ebt_target redirect_target =
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init ebt_redirect_init(void)
 {
        return ebt_register_target(&redirect_target);
 }
 
-static void __exit fini(void)
+static void __exit ebt_redirect_fini(void)
 {
        ebt_unregister_target(&redirect_target);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ebt_redirect_init);
+module_exit(ebt_redirect_fini);
 MODULE_LICENSE("GPL");