From: Naohiro Ooiwa <nooiwa@miraclelinux•com>
To: Michael Chan <mchan@broadcom•com>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>
Subject: Re: [PATCH] bnx2: Fix the behavior of ethtool when ONBOOT=no
Date: Wed, 24 Jun 2009 14:45:42 +0900 [thread overview]
Message-ID: <4A41BD86.9050208@miraclelinux.com> (raw)
In-Reply-To: <C27F8246C663564A84BB7AB343977242178EE78081@IRVEXCHCCR01.corp.ad.broadcom.com>
Hi Michael
Thank you for your reply.
I tested this patch now.
The result was good for me.
Thanks you.
Naohiro Ooiwa
Michael Chan wrote:
> Naohiro Ooiwa wrote:
>
>> Hi Michael
>>
>> Thank you for quick reply and checking my patch.
>>
>> You're right.
>> So, can we change the get_link method in ethtool ops.
>> The following is image.
>>
>> How do you feel about this idea.
>>
>>
>> Best Regards,
>> Naohiro Ooiwa
>>
>>
>> Signed-off-by: Ooiwa Naohiro <nooiwa@miraclelinux•com>
>
> This patch is fine. Thanks.
>
> Acked-by: Michael Chan <mchan@broadcom•com>
>
>> ---
>> bnx2.c | 10 +++++++++-
>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
>> index 9eee986..89cd235 100644
>> --- a/drivers/net/bnx2.c
>> +++ b/drivers/net/bnx2.c
>> @@ -6824,6 +6824,14 @@ bnx2_nway_reset(struct net_device *dev)
>> }
>>
>> static int
>> +bnx2_get_link(struct net_device *dev)
>> +{
>> + struct bnx2 *bp = netdev_priv(dev);
>> +
>> + return bp->link_up;
>> +}
>> +
>> +static int
>> bnx2_get_eeprom_len(struct net_device *dev)
>> {
>> struct bnx2 *bp = netdev_priv(dev);
>> @@ -7390,7 +7398,7 @@ static const struct ethtool_ops
>> bnx2_ethtool_ops = {
>> .get_wol = bnx2_get_wol,
>> .set_wol = bnx2_set_wol,
>> .nway_reset = bnx2_nway_reset,
>> - .get_link = ethtool_op_get_link,
>> + .get_link = bnx2_get_link,
>> .get_eeprom_len = bnx2_get_eeprom_len,
>> .get_eeprom = bnx2_get_eeprom,
>> .set_eeprom = bnx2_set_eeprom,
>>
>>
>>
>>
>> Michael Chan wrote:
>>> Naohiro Ooiwa wrote:
>>>
>>>> Hi Michael
>>>>
>>>> I found a little bug.
>>>>
>>>> When configure in ifcfg-eth* is ONBOOT=no,
>>>> the behavior of ethtool command is wrong.
>>>>
>>>> # grep ONBOOT /etc/sysconfig/network-scripts/ifcfg-eth2
>>>> ONBOOT=no
>>>> # ethtool eth2 | tail -n1
>>>> Link detected: yes
>>>>
>>>> I think "Link detected" should be "no".
>>>>
>>>> The bnx2 driver should run netif_carrier_off() in initialization
>>>> until bnx2_open() is called.
>>>>
>>>> The following is my patch.
>>>> It move netif_carrier_off() to bnx2_init_one().
>>>> I had already tested this patch. The result is good for me.
>>>>
>>>> Could you please check the my patch ?
>>>>
>>>>
>>>> Best Regards,
>>>> Naohiro Ooiwa
>>>>
>>>>
>>>> Signed-off-by: Naohiro Ooiwa <nooiwa@meriraclelinux•com>
>>> This patch will not work. Calling netif_carrier_off() will schedule
>>> a link_watch event. If register_netdev() fails for any reason, the
>>> netdev will be freed but the link_watch event can still be
>> scheduled.
>>> Calling netif_carrier_off() after register_netdev() returns also
>>> will not work because it can then race with ->open() and
>> the interrupt
>>> that indicates link up.
>>>
>>> Thanks.
>>>
>>>> ---
>>>> drivers/net/bnx2.c | 5 +++--
>>>> 1 files changed, 3 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
>>>> index 38f1c33..9eee986 100644
>>>> --- a/drivers/net/bnx2.c
>>>> +++ b/drivers/net/bnx2.c
>>>> @@ -6151,8 +6151,6 @@ bnx2_open(struct net_device *dev)
>>>> struct bnx2 *bp = netdev_priv(dev);
>>>> int rc;
>>>>
>>>> - netif_carrier_off(dev);
>>>> -
>>>> bnx2_set_power_state(bp, PCI_D0);
>>>> bnx2_disable_int(bp);
>>>>
>>>> @@ -8066,6 +8064,9 @@ bnx2_init_one(struct pci_dev *pdev,
>>>> const struct pci_device_id *ent)
>>>> if (CHIP_NUM(bp) == CHIP_NUM_5709)
>>>> dev->features |= NETIF_F_TSO6;
>>>>
>>>> + /* Should set nocarrier until bnx2_open() is called */
>>>> + netif_carrier_off(dev);
>>>> +
>>>> if ((rc = register_netdev(dev))) {
>>>> dev_err(&pdev->dev, "Cannot register net device\n");
>>>> goto error;
>>>> --
>>>> 1.5.4.1
>>>>
>>>>
>>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>>> the body of a message to majordomo@vger•kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>>
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger•kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2009-06-24 5:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-24 2:57 [PATCH] bnx2: Fix the behavior of ethtool when ONBOOT=no Naohiro Ooiwa
2009-06-24 3:48 ` Michael Chan
2009-06-24 4:43 ` Naohiro Ooiwa
2009-06-24 5:04 ` Michael Chan
2009-06-24 5:45 ` Naohiro Ooiwa [this message]
2009-06-24 7:08 ` David Miller
2009-06-24 7:16 ` David Miller
2009-06-24 8:39 ` Naohiro Ooiwa
2009-06-24 16:43 ` Rick Jones
2009-06-24 16:59 ` Michael Chan
2009-06-24 23:42 ` David Miller
2009-06-24 23:48 ` Michael Chan
2009-06-25 0:12 ` David Miller
2009-06-25 0:25 ` David Miller
2009-06-26 4:30 ` Naohiro Ooiwa
2009-06-29 0:49 ` Naohiro Ooiwa
2009-06-30 14:50 ` Eilon Greenstein
2009-06-30 19:46 ` David Miller
2009-07-02 4:46 ` Naohiro Ooiwa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A41BD86.9050208@miraclelinux.com \
--to=nooiwa@miraclelinux$(echo .)com \
--cc=mchan@broadcom$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox