Merge master branch into vswitchd.

diff --cc datapath/datapath.c
Simple merge

diff --cc datapath/datapath.h
Simple merge

diff --cc lib/learning-switch.c
Simple merge

diff --cc lib/ofp-print.c
Simple merge

diff --cc lib/vlog-modules.def
Simple merge

diff --cc secchan/in-band.c
index 6069eabe2c9e7270cc4db80ed805240a68529bac,8556a6ec4378d3462d403e9e4457e31005e013dc..46109daf19379e3f562c937dce2e179d368dc34f
--- 1/secchan/in-band.c
--- 2/secchan/in-band.c
+++ b/secchan/in-band.c
@@@ -167,11 -169,17 +169,17 @@@ in_band_local_packet_cb(struct relay *r
                 && is_controller_mac(eth->eth_src, in_band)) {
          /* ARP sent by controller. */
          out_port = OFPP_FLOOD;
-     } else if (is_controller_mac(eth->eth_dst, in_band)
-                || is_controller_mac(eth->eth_src, in_band)) {
+     } else if ((is_controller_mac(eth->eth_dst, in_band)
+                 || is_controller_mac(eth->eth_src, in_band))
+                && flow.dl_type == htons(ETH_TYPE_IP)
+                && flow.nw_proto == IP_TYPE_TCP
+                && (flow.tp_src == htons(OFP_TCP_PORT)
+                    || flow.tp_src == htons(OFP_SSL_PORT)
+                    || flow.tp_dst == htons(OFP_TCP_PORT)
+                    || flow.tp_dst == htons(OFP_SSL_PORT))) {
          /* Traffic to or from controller.  Switch it by hand. */
          in_band_learn_mac(in_band, in_port, eth->eth_src);
 -        out_port = mac_learning_lookup(in_band->ml, eth->eth_dst);
 +        out_port = mac_learning_lookup(in_band->ml, eth->eth_dst, 0);
      } else {
          const uint8_t *controller_mac;
          controller_mac = get_controller_mac(in_band);

diff --cc secchan/secchan.8.in
Simple merge

diff --cc secchan/secchan.c
Simple merge