Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / bridge / netfilter / ebt_log.c

diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 288ff1d4ccc47fc453ba1cb6b605581da8722358..985df82e427b2f9b2128a5bc68da1aed273dacd0 100644 (file)
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -38,8 +38,8 @@ static int ebt_log_check(const char *tablename, unsigned int hookmask,
 
 struct tcpudphdr
 {
-       uint16_t src;
-       uint16_t dst;
+       __be16 src;
+       __be16 dst;
 };
 
 struct arppayload
@@ -96,6 +96,7 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum,
                       NIPQUAD(ih->daddr), ih->tos, ih->protocol);
                if (ih->protocol == IPPROTO_TCP ||
                    ih->protocol == IPPROTO_UDP ||
+                   ih->protocol == IPPROTO_UDPLITE ||
                    ih->protocol == IPPROTO_SCTP ||
                    ih->protocol == IPPROTO_DCCP) {
                        struct tcpudphdr _ports, *pptr;
@@ -130,7 +131,7 @@ ebt_log_packet(unsigned int pf, unsigned int hooknum,
                 * then log the ARP payload */
                if (ah->ar_hrd == htons(1) &&
                    ah->ar_hln == ETH_ALEN &&
-                   ah->ar_pln == sizeof(uint32_t)) {
+                   ah->ar_pln == sizeof(__be32)) {
                        struct arppayload _arpp, *ap;
 
                        ap = skb_header_pointer(skb, sizeof(_arph),
@@ -168,7 +169,7 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
 
        if (info->bitmask & EBT_LOG_NFLOG)
                nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li,
-                             info->prefix);
+                             "%s", info->prefix);
        else
                ebt_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li,
                               info->prefix);
@@ -188,7 +189,7 @@ static struct nf_logger ebt_log_logger = {
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init ebt_log_init(void)
 {
        int ret;
 
@@ -205,12 +206,12 @@ static int __init init(void)
        return 0;
 }
 
-static void __exit fini(void)
+static void __exit ebt_log_fini(void)
 {
        nf_log_unregister_logger(&ebt_log_logger);
        ebt_unregister_watcher(&log);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ebt_log_init);
+module_exit(ebt_log_fini);
 MODULE_LICENSE("GPL");