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 <vsai...@vmware.com> --- lib/netlink-conntrack.c | 8 -------- lib/netlink-protocol.h | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c index 5132bf2..d83b09a 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 8938055..a7b9a65 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. */ -- 2.9.0.windows.1 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev