diff options
author | Jiri Benc <jbenc@redhat.com> | 2016-11-10 16:28:18 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-11-13 06:51:02 +0100 |
commit | 329f45bc4f191c663dc156c510816411a4310578 (patch) | |
tree | 8e505cd157e30c5cbfe4789822ed4f571806d276 /net/openvswitch/flow_netlink.c | |
parent | openvswitch: use hard_header_len instead of hardcoded ETH_HLEN (diff) | |
download | linux-329f45bc4f191c663dc156c510816411a4310578.tar.xz linux-329f45bc4f191c663dc156c510816411a4310578.zip |
openvswitch: add mac_proto field to the flow key
Use a hole in the structure. We support only Ethernet so far and will add
a support for L2-less packets shortly. We could use a bool to indicate
whether the Ethernet header is present or not but the approach with the
mac_proto field is more generic and occupies the same number of bytes in the
struct, while allowing later extensibility. It also makes the code in the
next patches more self explaining.
It would be nice to use ARPHRD_ constants but those are u16 which would be
waste. Thus define our own constants.
Another upside of this is that we can overload this new field to also denote
whether the flow key is valid. This has the advantage that on
refragmentation, we don't have to reparse the packet but can rely on the
stored eth.type. This is especially important for the next patches in this
series - instead of adding another branch for L2-less packets before calling
ovs_fragment, we can just remove all those branches completely.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow_netlink.c')
-rw-r--r-- | net/openvswitch/flow_netlink.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index ae25ded82b3b..ccb9900c5230 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -1059,6 +1059,11 @@ static int metadata_from_nlattrs(struct net *net, struct sw_flow_match *match, sizeof(*cl), is_mask); *attrs &= ~(1ULL << OVS_KEY_ATTR_CT_LABELS); } + + /* Always exact match mac_proto */ + SW_FLOW_KEY_PUT(match, mac_proto, is_mask ? 0xff : MAC_PROTO_ETHERNET, + is_mask); + return 0; } |