From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by dpdk.org (Postfix) with ESMTP id 0F68958EE for ; Fri, 26 Jul 2013 11:50:57 +0200 (CEST) Received: by mail-ee0-f41.google.com with SMTP id d17so962617eek.28 for ; Fri, 26 Jul 2013 02:51:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:x-gm-message-state; bh=d9mB0dA4kVL3tZCFdflBqEn5Hg8g9T78Xjd6SImv5Wo=; b=EX9Y34fSAm3X/YKbm+bZie/MsBaDSXQ+xgtQoD0UVwo4cCHHABve9PLO2I+NeHqYOi Zrufn9qiHsyY3KXlz89VuHboDSPM1+mUx9y53DA6TYBWfu+xZbDz22iJBfQ5eKllyQ30 JDvOBNjJ7N43JgezusIg95spRFjKuVenKjW+n5VPAmYsiAY+Je69sJGbQfVfTdgyqj+O T30V/mRDjCMDyDPaaFWysBP18Mb/4N5KJHG2ngwNFF4ZG0AKq77ee7eyU0zNlMP6wvP9 58qYpsOALsvLhckPvgW9VBewhQCEHbWgVssufkwElNFbwWj4vD/46M92cknbiZuoi1NU qFcg== X-Received: by 10.15.41.196 with SMTP id s44mr46517089eev.138.1374832280712; Fri, 26 Jul 2013 02:51:20 -0700 (PDT) Received: from 6wind.com (6wind.net2.nerim.net. [213.41.180.237]) by mx.google.com with ESMTPSA id i2sm79846866eeu.4.2013.07.26.02.51.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Jul 2013 02:51:19 -0700 (PDT) Received: by 6wind.com (sSMTP sendmail emulation); Fri, 26 Jul 2013 11:51:15 +0200 From: Thomas Monjalon To: dev@dpdk.org Date: Fri, 26 Jul 2013 11:51:15 +0200 Message-Id: <1374832275-25727-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkUtl6U9QhNhWLSwBiSVp1rDz8BhvfwBWkxq82PGLXlCkSSz/JtSKyIXNgUm8hokSrekOTI Subject: [dpdk-dev] [PATCH] kni: fix build with 802.1p kernel support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jul 2013 09:50:58 -0000 C90 compilers forbid mixed declaration and code. Signed-off-by: Thomas Monjalon --- lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c index 85de817..947be44 100755 --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c @@ -314,6 +314,9 @@ void ixgbe_vlan_mode(struct net_device *netdev, u32 features) #endif { struct ixgbe_adapter *adapter = netdev_priv(netdev); +#ifdef HAVE_8021P_SUPPORT + bool enable; +#endif #ifdef HAVE_VLAN_RX_REGISTER //if (!test_bit(__IXGBE_DOWN, &adapter->state)) @@ -326,9 +329,9 @@ void ixgbe_vlan_mode(struct net_device *netdev, u32 features) #endif #ifdef HAVE_8021P_SUPPORT #ifdef HAVE_VLAN_RX_REGISTER - bool enable = (grp || (adapter->flags & IXGBE_FLAG_DCB_ENABLED)); + enable = (grp || (adapter->flags & IXGBE_FLAG_DCB_ENABLED)); #else - bool enable = !!(features & NETIF_F_HW_VLAN_RX); + enable = !!(features & NETIF_F_HW_VLAN_RX); #endif if (enable) /* enable VLAN tag insert/strip */ -- 1.7.10.4