[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTikaE-88LSZcMhZaqrpJzeZi0gSdQX1KAvj5vOPA@mail.gmail.com>
Date: Thu, 21 Oct 2010 14:38:34 -0700
From: Jesse Gross <jesse@...ira.com>
To: Ben Hutchings <bhutchings@...arflare.com>
Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
Michael Chan <mchan@...adcom.com>
Subject: Re: [PATCH v2 09/14] bnx2: Update bnx2 to use new vlan accleration.
On Thu, Oct 21, 2010 at 8:31 AM, Ben Hutchings
<bhutchings@...arflare.com> wrote:
> On Wed, 2010-10-20 at 16:56 -0700, Jesse Gross wrote:
>> Make the bnx2 driver use the new vlan accleration model.
>>
>> Signed-off-by: Jesse Gross <jesse@...ira.com>
>> CC: Michael Chan <mchan@...adcom.com>
>> ---
>> drivers/net/bnx2.c | 97 +++++++++++++++-------------------------------------
>> drivers/net/bnx2.h | 4 --
>> 2 files changed, 28 insertions(+), 73 deletions(-)
>>
>> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
>> index 363ca8b..bf3c830 100644
>> --- a/drivers/net/bnx2.c
>> +++ b/drivers/net/bnx2.c
> [...]
>> @@ -7578,7 +7523,28 @@ bnx2_set_tx_csum(struct net_device *dev, u32 data)
>> static int
>> bnx2_set_flags(struct net_device *dev, u32 data)
>> {
>> - return ethtool_op_set_flags(dev, data, ETH_FLAG_RXHASH);
>> + struct bnx2 *bp = netdev_priv(dev);
>> + int rc;
>> +
>> + if (!(bp->flags & BNX2_FLAG_CAN_KEEP_VLAN) &&
>> + !(data & ETH_FLAG_RXVLAN))
>> + return -EOPNOTSUPP;
> [...]
>
> Should be -EINVAL.
OK, thanks. I've sent out a patch to fix this (and a similar one in
the bnx2x driver).
--
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
Powered by blists - more mailing lists