diff options
| author | Sairam Venugopal <vsairam@vmware.com> | 2016-07-11 14:59:50 -0700 |
|---|---|---|
| committer | Gurucharan Shetty <guru@ovn.org> | 2016-07-13 15:11:54 -0700 |
| commit | 218e42da3d38005cb94ad2d699a794977043b900 (patch) | |
| tree | b43bcfdf75e45e153c04d0d91b30dece75a3e219 /lib | |
| parent | e70f55edbc47e99432da7c868594d7f9d9589eca (diff) | |
| download | openvswitch-218e42da3d38005cb94ad2d699a794977043b900.tar.gz | |
Windows: Use NETLINK_NETFILTER instead of NETLINK_GENERIC
Windows datapath lacked support for different Netlink Family protocols.
Now that Windows supports different Netlink protocol, revert the change to
override NETLINK_NETFILTER to use NETLINK_GENERIC.
Signed-off-by: Sairam Venugopal <vsairam@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/netlink-conntrack.c | 8 | ||||
| -rw-r--r-- | lib/netlink-protocol.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c index 5132bf283..d83b09a4f 100644 --- a/lib/netlink-conntrack.c +++ b/lib/netlink-conntrack.c @@ -75,14 +75,6 @@ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); #define IPS_UNTRACKED_BIT 12 #define IPS_UNTRACKED (1 << IPS_UNTRACKED_BIT) -#ifdef _WIN32 -#ifdef NETLINK_NETFILTER -#undef NETLINK_NETFILTER -#endif -/* Reuse same socket for nfgenmsg and genlmsghdr in Windows*/ -#define NETLINK_NETFILTER NETLINK_GENERIC -#endif - static const struct nl_policy nfnlgrp_conntrack_policy[] = { [CTA_TUPLE_ORIG] = { .type = NL_A_NESTED, .optional = false }, [CTA_TUPLE_REPLY] = { .type = NL_A_NESTED, .optional = false }, diff --git a/lib/netlink-protocol.h b/lib/netlink-protocol.h index 893805576..a7b9a65fa 100644 --- a/lib/netlink-protocol.h +++ b/lib/netlink-protocol.h @@ -38,6 +38,7 @@ #include <linux/genetlink.h> #else +#define NETLINK_NETFILTER 12 #define NETLINK_GENERIC 16 /* nlmsg_flags bits. */ |