From: Justin Pettit <jpettit@nicira.com>
Date: Fri, 22 Feb 2013 22:29:12 +0000 (-0800)
Subject: Revert "match: Only print tp_src and tp_dst for TCP and UDP."
X-Git-Tag: sliver-openvswitch-1.10.90-1~11^2~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1f6d8197c11015f5eb365914591620be10055ef5;p=sliver-openvswitch.git

Revert "match: Only print tp_src and tp_dst for TCP and UDP."

This reverts commit 9a9a690cc0bc07bb2a0fa01221492cdab61673e3.

This commit broke some unit tests, and I want to think about how to
address them.  I also noticed other fields we should also not print.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/lib/match.c b/lib/match.c
index 2395fb483..f4b0a6c14 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -1053,8 +1053,7 @@ match_format(const struct match *match, struct ds *s, unsigned int priority)
                             &wc->masks.nd_target);
         format_eth_masked(s, "nd_sll", f->arp_sha, wc->masks.arp_sha);
         format_eth_masked(s, "nd_tll", f->arp_tha, wc->masks.arp_tha);
-    } else if (f->nw_proto == IPPROTO_TCP ||
-               f->nw_proto == IPPROTO_UDP) {
+    } else {
         format_be16_masked(s, "tp_src", f->tp_src, wc->masks.tp_src);
         format_be16_masked(s, "tp_dst", f->tp_dst, wc->masks.tp_dst);
     }