git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 'next' into 'master'.
[sliver-openvswitch.git]
/
lib
/
nx-match.c
diff --git
a/lib/nx-match.c
b/lib/nx-match.c
index
345f0d1
..
f5d62de
100644
(file)
--- a/
lib/nx-match.c
+++ b/
lib/nx-match.c
@@
-677,7
+677,7
@@
nxm_put_eth(struct ofpbuf *b, uint32_t header,
static void
nxm_put_eth_dst(struct ofpbuf *b,
-
uint32
_t wc, const uint8_t value[ETH_ADDR_LEN])
+
flow_wildcards
_t wc, const uint8_t value[ETH_ADDR_LEN])
{
switch (wc & (FWW_DL_DST | FWW_ETH_MCAST)) {
case FWW_DL_DST | FWW_ETH_MCAST: