* [PATCH-2.6] e1000: fix media_type <-> phy_type thinko
@ 2006-04-15 11:00 Willy TARREAU
2006-04-16 17:48 ` Auke Kok
2006-04-17 16:51 ` Jesse Brandeburg
0 siblings, 2 replies; 3+ messages in thread
From: Willy TARREAU @ 2006-04-15 11:00 UTC (permalink / raw)
To: jesse.brandeburg, netdev, linux-kernel; +Cc: rol
Recent patch cb764326dff0ee51aca0d450e1a292de65661055 introduced
a thinko in e1000_main.c : e1000_media_type_copper is compared
to hw.phy_type instead of hw.media_type. Original patch proposed
by Jesse Brandeburg was correct, but what has been merged is not.
---
drivers/net/e1000/e1000_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
3df8a180d50c89a72c28abf37151e38ffda75f39
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index add8dc4..590a456 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4156,7 +4156,7 @@ e1000_mii_ioctl(struct net_device *netde
spin_unlock_irqrestore(&adapter->stats_lock, flags);
return -EIO;
}
- if (adapter->hw.phy_type == e1000_media_type_copper) {
+ if (adapter->hw.media_type == e1000_media_type_copper) {
switch (data->reg_num) {
case PHY_CTRL:
if (mii_reg & MII_CR_POWER_DOWN)
--
1.2.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH-2.6] e1000: fix media_type <-> phy_type thinko
2006-04-15 11:00 [PATCH-2.6] e1000: fix media_type <-> phy_type thinko Willy TARREAU
@ 2006-04-16 17:48 ` Auke Kok
2006-04-17 16:51 ` Jesse Brandeburg
1 sibling, 0 replies; 3+ messages in thread
From: Auke Kok @ 2006-04-16 17:48 UTC (permalink / raw)
To: Willy TARREAU; +Cc: jesse.brandeburg, netdev, linux-kernel, rol
Willy TARREAU wrote:
> Recent patch cb764326dff0ee51aca0d450e1a292de65661055 introduced
> a thinko in e1000_main.c : e1000_media_type_copper is compared
> to hw.phy_type instead of hw.media_type. Original patch proposed
> by Jesse Brandeburg was correct, but what has been merged is not.
Indeed this seems like a mistake to me. I'll make sure this is checked
tomorrow with Jeff Kirsher who submitted the original patch.
Auke Kok
> ---
>
> drivers/net/e1000/e1000_main.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> 3df8a180d50c89a72c28abf37151e38ffda75f39
> diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> index add8dc4..590a456 100644
> --- a/drivers/net/e1000/e1000_main.c
> +++ b/drivers/net/e1000/e1000_main.c
> @@ -4156,7 +4156,7 @@ e1000_mii_ioctl(struct net_device *netde
> spin_unlock_irqrestore(&adapter->stats_lock, flags);
> return -EIO;
> }
> - if (adapter->hw.phy_type == e1000_media_type_copper) {
> + if (adapter->hw.media_type == e1000_media_type_copper) {
> switch (data->reg_num) {
> case PHY_CTRL:
> if (mii_reg & MII_CR_POWER_DOWN)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH-2.6] e1000: fix media_type <-> phy_type thinko
2006-04-15 11:00 [PATCH-2.6] e1000: fix media_type <-> phy_type thinko Willy TARREAU
2006-04-16 17:48 ` Auke Kok
@ 2006-04-17 16:51 ` Jesse Brandeburg
1 sibling, 0 replies; 3+ messages in thread
From: Jesse Brandeburg @ 2006-04-17 16:51 UTC (permalink / raw)
To: Willy TARREAU, jgarzik; +Cc: jesse.brandeburg, netdev, linux-kernel, rol
On Sat, 15 Apr 2006, Willy TARREAU wrote:
> Recent patch cb764326dff0ee51aca0d450e1a292de65661055 introduced
> a thinko in e1000_main.c : e1000_media_type_copper is compared
> to hw.phy_type instead of hw.media_type. Original patch proposed
> by Jesse Brandeburg was correct, but what has been merged is not.
Yes, this fix makes the code how it should have been.
Ack.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
---
drivers/net/e1000/e1000_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
3df8a180d50c89a72c28abf37151e38ffda75f39
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index add8dc4..590a456 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4156,7 +4156,7 @@ e1000_mii_ioctl(struct net_device *netde
spin_unlock_irqrestore(&adapter->stats_lock, flags);
return -EIO;
}
- if (adapter->hw.phy_type == e1000_media_type_copper) {
+ if (adapter->hw.media_type == e1000_media_type_copper) {
switch (data->reg_num) {
case PHY_CTRL:
if (mii_reg & MII_CR_POWER_DOWN)
--
1.2.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-04-17 16:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-15 11:00 [PATCH-2.6] e1000: fix media_type <-> phy_type thinko Willy TARREAU
2006-04-16 17:48 ` Auke Kok
2006-04-17 16:51 ` Jesse Brandeburg
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).