diff options
| author | Joe Stringer <joestringer@nicira.com> | 2015-08-26 11:31:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-27 11:40:42 -0700 |
| commit | be26b9a88fcee570796c67701f50800039e25aec (patch) | |
| tree | 4378b79e91b6bc0511217dbe8958ba70bfbac569 /net/openvswitch/datapath.h | |
| parent | 8e2fed1c0cfbb29995a4301060acc0ef4ee84420 (diff) | |
| download | linux-stable-be26b9a88fcee570796c67701f50800039e25aec.tar.gz linux-stable-be26b9a88fcee570796c67701f50800039e25aec.tar.bz2 linux-stable-be26b9a88fcee570796c67701f50800039e25aec.zip | |
openvswitch: Move MASKED* macros to datapath.h
This will allow the ovs-conntrack code to reuse these macros.
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/datapath.h')
| -rw-r--r-- | net/openvswitch/datapath.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h index 6b28c5cedb23..487a85f7d967 100644 --- a/net/openvswitch/datapath.h +++ b/net/openvswitch/datapath.h @@ -200,6 +200,10 @@ void ovs_dp_notify_wq(struct work_struct *work); int action_fifos_init(void); void action_fifos_exit(void); +/* 'KEY' must not have any bits set outside of the 'MASK' */ +#define OVS_MASKED(OLD, KEY, MASK) ((KEY) | ((OLD) & ~(MASK))) +#define OVS_SET_MASKED(OLD, KEY, MASK) ((OLD) = OVS_MASKED(OLD, KEY, MASK)) + #define OVS_NLERR(logging_allowed, fmt, ...) \ do { \ if (logging_allowed && net_ratelimit()) \ |