[EBTABLES]: Fix thinkos in ebt_log.c

When converting over the skb_header_pointer(), I converted parts of
this module incorrectly. Kill the 'u' union in ebt_log() and all the
bogus references to it.

Signed-off-by: David S. Miller <davem@davemloft.net>

+2 -4
+2 -4
net/bridge/netfilter/ebt_log.c
··· 61 61 { 62 62 struct ebt_log_info *info = (struct ebt_log_info *)data; 63 63 char level_string[4] = "< >"; 64 - union {struct iphdr iph; struct tcpudphdr ports; 65 - struct arphdr arph; struct arppayload arpp;} u; 66 64 67 65 level_string[1] = '0' + info->loglevel; 68 66 spin_lock_bh(&ebt_log_lock); ··· 86 88 } 87 89 printk(" IP SRC=%u.%u.%u.%u IP DST=%u.%u.%u.%u,", 88 90 NIPQUAD(ih->saddr), NIPQUAD(ih->daddr)); 89 - printk(" IP tos=0x%02X, IP proto=%d", u.iph.tos, 91 + printk(" IP tos=0x%02X, IP proto=%d", ih->tos, 90 92 ih->protocol); 91 93 if (ih->protocol == IPPROTO_TCP || 92 94 ih->protocol == IPPROTO_UDP) { ··· 125 127 ah->ar_pln == sizeof(uint32_t)) { 126 128 struct arppayload _arpp, *ap; 127 129 128 - ap = skb_header_pointer(skb, sizeof(u.arph), 130 + ap = skb_header_pointer(skb, sizeof(_arph), 129 131 sizeof(_arpp), &_arpp); 130 132 if (ap == NULL) { 131 133 printk(" INCOMPLETE ARP payload");