netdev - Re: [PATCH] ixgbe: ixgbe

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <AANLkTi==NOe4w-=yHw8KptSyCpT+ir9X32W3z2_km0sN@mail.gmail.com>
Date:	Tue, 3 Aug 2010 14:55:47 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	Jon Mason <jon.mason@...r.com>
Cc:	Jesse Brandeburg <jesse.brandeburg@...el.com>,
	Bruce Allan <bruce.w.allan@...el.com>,
	Alex Duyck <alexander.h.duyck@...el.com>,
	PJ Waskiewicz <peter.p.waskiewicz.jr@...el.com>,
	John Ronciak <john.ronciak@...el.com>,
	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	e1000-devel@...ts.sourceforge.net
Subject: Re: [PATCH] ixgbe: ixgbe_fcoe build break

On Tue, Aug 3, 2010 at 08:57, Jon Mason <jon.mason@...r.com> wrote:
> struct ixgbe_fcoe has fields that are #ifdef'ed with CONFIG_IXGBE_DCB.
> However, not all references to those fields check for CONFIG_IXGBE_DCB.
> This patch adds the necessary check to allow for ixgbe to compile.
>
> Signed-off-by: Jon Mason <jon.mason@...r.com>
> ---
>  drivers/net/ixgbe/ixgbe_main.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
> index 7d6a415..9ec3dfe 100644
> --- a/drivers/net/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ixgbe/ixgbe_main.c
> @@ -6155,9 +6155,11 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
>                        txq &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
>                        txq += adapter->ring_feature[RING_F_FCOE].mask;
>                        return txq;
> +#ifdef CONFIG_IXGBE_DCB
>                } else if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
>                        txq = adapter->fcoe.up;
>                        return txq;
> +#endif
>                }
>        }
>  #endif
> @@ -6218,8 +6220,10 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
>             skb->protocol == htons(ETH_P_FIP))) {
>                tx_flags &= ~(IXGBE_TX_FLAGS_VLAN_PRIO_MASK
>                              << IXGBE_TX_FLAGS_VLAN_SHIFT);
> +#ifdef CONFIG_IXGBE_DCB
>                tx_flags |= ((adapter->fcoe.up << 13)
>                              << IXGBE_TX_FLAGS_VLAN_SHIFT);
> +#endif
>                /* flag for FCoE offloads */
>                if (skb->protocol == htons(ETH_P_FCOE))
>                        tx_flags |= IXGBE_TX_FLAGS_FCOE;
> --

Thanks Jon.  I think I may already have a patch in my queue with this
fix, but if I do not, I make sure to add your patch.

-- 
Cheers,
Jeff
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html