From 73a9f3418e5ad987a1e2c52c63af1ad511ecc1cb Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Fri, 2 May 2014 10:33:45 -0700 Subject: [PATCH] datapath: Fix feature check for HAVE_RXHASH. The check for HAVE_RXHASH use #if rather than #ifdef, which provokes a warning when it isn't defined. Signed-off-by: Jesse Gross --- datapath/linux/compat/include/linux/skbuff.h | 4 ++-- debian/changelog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h index a9dc2e712..b011396ef 100644 --- a/datapath/linux/compat/include/linux/skbuff.h +++ b/datapath/linux/compat/include/linux/skbuff.h @@ -286,10 +286,10 @@ int skb_zerocopy(struct sk_buff *to, struct sk_buff *from, int len, #ifndef HAVE_SKB_CLEAR_HASH static inline void skb_clear_hash(struct sk_buff *skb) { -#if HAVE_RXHASH +#ifdef HAVE_RXHASH skb->rxhash = 0; #endif -#if HAVE_L4_RXHASH +#ifdef HAVE_L4_RXHASH skb->l4_rxhash = 0; #endif } diff --git a/debian/changelog b/debian/changelog index d6ed63dc9..3c421139d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ openvswitch (2.2.0-1) unstable; urgency=low - Upon the receipt of a SIGHUP signal, ovs-vswitchd no longer reopens its log file (it will terminate instead). Please use 'ovs-appctl vlog/reopen' instead. - - Support for Linux kernels up to 3.13. From Kernel 3.12 onwards OVS uses + - Support for Linux kernels up to 3.14. From Kernel 3.12 onwards OVS uses tunnel API for GRE and VXLAN. - Added DPDK support. - Added support for custom vlog patterns in Python -- 2.43.0