[SK_BUFF]: unions of just one member don't get anything done, kill them

[net-next-2.6.git] / net / ipv6 / netfilter / ip6t_LOG.c

diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index dc9ec93057782a0ea1900da5bf19e0819aa06047..b465e24e90b35def7bd8e06910b139b5a2ae9c49 100644 (file)
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -396,8 +396,8 @@ ip6t_log_packet(unsigned int pf,
                /* MAC logging for input chain only. */
                printk("MAC=");
                if (skb->dev && (len = skb->dev->hard_header_len) &&
-                   skb->mac.raw != skb->nh.raw) {
-                       unsigned char *p = skb->mac.raw;
+                   skb->mac_header != skb->network_header) {
+                       const unsigned char *p = skb_mac_header(skb);
                        int i;
 
                        if (skb->dev->type == ARPHRD_SIT &&
@@ -412,7 +412,8 @@ ip6t_log_packet(unsigned int pf,
                        printk(" ");
 
                        if (skb->dev->type == ARPHRD_SIT) {
-                               struct iphdr *iph = (struct iphdr *)skb->mac.raw;
+                               const struct iphdr *iph =
+                                       (struct iphdr *)skb_mac_header(skb);
                                printk("TUNNEL=%u.%u.%u.%u->%u.%u.%u.%u ",
                                       NIPQUAD(iph->saddr),
                                       NIPQUAD(iph->daddr));
@@ -421,7 +422,7 @@ ip6t_log_packet(unsigned int pf,
                        printk(" ");
        }
 
-       dump_packet(loginfo, skb, (u8*)skb->nh.ipv6h - skb->data, 1);
+       dump_packet(loginfo, skb, skb_network_offset(skb), 1);
        printk("\n");
        spin_unlock_bh(&log_lock);
 }
@@ -501,7 +502,7 @@ static int __init ip6t_log_init(void)
 
 static void __exit ip6t_log_fini(void)
 {
-       nf_log_unregister_logger(&ip6t_logger);
+       nf_log_unregister(&ip6t_logger);
        xt_unregister_target(&ip6t_log_reg);
 }