[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-id: <46EAF89C.4080808@foo-projects.org>
Date: Fri, 14 Sep 2007 14:09:48 -0700
From: "Kok, Auke" <sofar@...-projects.org>
To: Dan Williams <dcbw@...hat.com>, netdev@...r.kernel.org,
Jan-Bernd Themann <ossthema@...ibm.com>
Cc: Jeff Garzik <jeff@...zik.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Linus Torvalds <torvalds@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [git patches] net driver fixes
Dan Williams wrote:
> On Thu, 2007-09-13 at 01:30 -0400, Jeff Garzik wrote:
>> Please pull from 'upstream-linus' branch of
>> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
>>
>> to receive the following updates:
>>
>> drivers/net/atl1/atl1_main.c | 19 +++++++------------
>> drivers/net/ehea/ehea.h | 5 ++++-
>> drivers/net/ehea/ehea_main.c | 16 ++++++++++++++--
>> drivers/net/phy/phy.c | 4 ++--
>> drivers/net/phy/phy_device.c | 4 ++--
>> drivers/net/sky2.c | 9 ++++++++-
>> drivers/net/spider_net.c | 12 ++++--------
>> 7 files changed, 41 insertions(+), 28 deletions(-)
>>
>> Hans-Jürgen Koch (1):
>> Fix a lock problem in generic phy code
>>
>> Ishizaki Kou (1):
>> spidernet: fix interrupt reason recognition
>>
>> Jan-Bernd Themann (2):
>> ehea: propagate physical port state
>> ehea: fix last_rx update
>>
maybe a little bit late with this comment:
>> ehea_error("Failed setting port speed");
>> }
>> }
>> - netif_carrier_on(port->netdev);
>> + if (!prop_carrier_state || (port->phy_link == EHEA_PHY_LINK_UP))
>> + netif_carrier_on(port->netdev);
>> +
>> kfree(cb4);
>> out:
>> return ret;
>> @@ -869,13 +875,19 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
>> }
>>
>> if (EHEA_BMASK_GET(NEQE_EXTSWITCH_PORT_UP, eqe)) {
>> + port->phy_link = EHEA_PHY_LINK_UP;
>> if (netif_msg_link(port))
>> ehea_info("%s: Physical port up",
>> port->netdev->name);
>> + if (prop_carrier_state)
>> + netif_carrier_on(port->netdev);
>> } else {
>> + port->phy_link = EHEA_PHY_LINK_DOWN;
>> if (netif_msg_link(port))
>> ehea_info("%s: Physical port down",
>> port->netdev->name);
>> + if (prop_carrier_state)
>> + netif_carrier_off(port->netdev);
maybe it was better to code this as 'ehea_carrier_off/on()' which then tests
(prop_carrier_state) - this now begs for regressions where this isn't properly
done in future commits, and on top of that there are all these extra conditions now.
Cheers,
Auke
-
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