* [PATCH] kni: fix build with 802.1p kernel support
@ 2013-07-26 9:51 Thomas Monjalon
[not found] ` <1374832275-25727-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Monjalon @ 2013-07-26 9:51 UTC (permalink / raw)
To: dev-VfR2kkLFssw
C90 compilers forbid mixed declaration and code.
Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] kni: fix build with 802.1p kernel support
[not found] ` <1374832275-25727-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
@ 2013-07-26 12:12 ` Adrien Mazarguil
[not found] ` <20130726121207.GJ7849-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Adrien Mazarguil @ 2013-07-26 12:12 UTC (permalink / raw)
To: Thomas Monjalon; +Cc: dev-VfR2kkLFssw
On Fri, Jul 26, 2013 at 11:51:15AM +0200, Thomas Monjalon wrote:
> C90 compilers forbid mixed declaration and code.
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> ---
> lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
Acked-by: Adrien Mazarguil <adrien.mazarguil-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
--
Adrien Mazarguil
6WIND
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] kni: fix build with 802.1p kernel support
[not found] ` <20130726121207.GJ7849-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
@ 2013-07-26 13:20 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2013-07-26 13:20 UTC (permalink / raw)
To: Adrien Mazarguil; +Cc: dev-VfR2kkLFssw
26/07/2013 14:12, Adrien Mazarguil :
> On Fri, Jul 26, 2013 at 11:51:15AM +0200, Thomas Monjalon wrote:
> > C90 compilers forbid mixed declaration and code.
> >
> > Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> > ---
> >
> > lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c | 7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
>
> Acked-by: Adrien Mazarguil <adrien.mazarguil-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
pushed
--
Thomas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-26 13:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-26 9:51 [PATCH] kni: fix build with 802.1p kernel support Thomas Monjalon
[not found] ` <1374832275-25727-1-git-send-email-thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2013-07-26 12:12 ` Adrien Mazarguil
[not found] ` <20130726121207.GJ7849-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
2013-07-26 13:20 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).