git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a9a690
)
Revert "match: Only print tp_src and tp_dst for TCP and UDP."
author
Justin Pettit
<jpettit@nicira.com>
Fri, 22 Feb 2013 22:29:12 +0000
(14:29 -0800)
committer
Justin Pettit
<jpettit@nicira.com>
Fri, 22 Feb 2013 22:29:12 +0000
(14:29 -0800)
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>
lib/match.c
patch
|
blob
|
history
diff --git
a/lib/match.c
b/lib/match.c
index
2395fb4
..
f4b0a6c
100644
(file)
--- 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);
}