lkml.org 
[lkml]   [2006]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH-2.6] e1000: fix media_type <-> phy_type thinko
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)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-04-16 19:51    [W:0.055 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site