2 files changed, 11 insertions, 26 deletions

diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index a94f3cc377c0..e4ea3fdd1d41 100644
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -50,14 +50,6 @@ struct arppayload
         unsigned char ip_dst[4];
 };
 
-static void print_MAC(const unsigned char *p)
-{
-        int i;
-
-        for (i = 0; i < ETH_ALEN; i++, p++)
-                printk("%02x%c", *p, i == ETH_ALEN - 1 ? ' ':':');
-}
-
 static void
 print_ports(const struct sk_buff *skb, uint8_t protocol, int offset)
 {
@@ -88,14 +80,11 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,
         unsigned int bitmask;
 
         spin_lock_bh(&ebt_log_lock);
-        printk("<%c>%s IN=%s OUT=%s MAC source = ", '0' + loginfo->u.log.level,
-               prefix, in ? in->name : "", out ? out->name : "");
-
-        print_MAC(eth_hdr(skb)->h_source);
-        printk("MAC dest = ");
-        print_MAC(eth_hdr(skb)->h_dest);
-
-        printk("proto = 0x%04x", ntohs(eth_hdr(skb)->h_proto));
+        printk("<%c>%s IN=%s OUT=%s MAC source = %pM MAC dest = %pM proto = 0x%04x",
+               '0' + loginfo->u.log.level, prefix,
+               in ? in->name : "", out ? out->name : "",
+               eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest,
+               ntohs(eth_hdr(skb)->h_proto));
 
         if (loginfo->type == NF_LOG_TYPE_LOG)
                 bitmask = loginfo->u.log.logflags;
@@ -171,12 +160,8 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,
                                 printk(" INCOMPLETE ARP payload");
                                 goto out;
                         }
-                        printk(" ARP MAC SRC=");
-                        print_MAC(ap->mac_src);
-                        printk(" ARP IP SRC=%pI4", ap->ip_src);
-                        printk(" ARP MAC DST=");
-                        print_MAC(ap->mac_dst);
-                        printk(" ARP IP DST=%pI4", ap->ip_dst);
+                        printk(" ARP MAC SRC=%pM ARP IP SRC=%pI4 ARP MAC DST=%pM ARP IP DST=%pI4",
+                                        ap->mac_src, ap->ip_src, ap->mac_dst, ap->ip_dst);
                 }
         }
 out:
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 8905cc76e0be..9ac2fdc36ecc 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -256,11 +256,11 @@ getorigdst(struct sock *sk, int optval, void __user *user, int *len)
         tuple.dst.u3.ip = inet->daddr;
         tuple.dst.u.tcp.port = inet->dport;
         tuple.src.l3num = PF_INET;
-        tuple.dst.protonum = IPPROTO_TCP;
+        tuple.dst.protonum = sk->sk_protocol;
 
-        /* We only do TCP at the moment: is there a better way? */
-        if (strcmp(sk->sk_prot->name, "TCP")) {
-                pr_debug("SO_ORIGINAL_DST: Not a TCP socket\n");
+        /* We only do TCP and SCTP at the moment: is there a better way? */
+        if (sk->sk_protocol != IPPROTO_TCP && sk->sk_protocol != IPPROTO_SCTP) {
+                pr_debug("SO_ORIGINAL_DST: Not a TCP/SCTP socket\n");
                 return -ENOPROTOOPT;
         }