* [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails.
@ 2010-02-20 20:55 Hauke Mehrtens
2010-02-20 20:55 ` [PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb Hauke Mehrtens
2010-02-22 23:46 ` [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Hauke Mehrtens @ 2010-02-20 20:55 UTC (permalink / raw)
To: davem; +Cc: zambrano, netdev, Hauke Mehrtens
Do a PHY reset to test if there is an active phy and set the PHY address
to B44_PHY_ADDR_NO_PHY in case of an not active phy. This is needed for
the Linksys WRTSL54GS and Asus WL-500W.
This patch was used in OpenWRT for a long time.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
drivers/net/b44.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 180510e..71fa0be 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -338,7 +338,7 @@ static int b44_phy_reset(struct b44 *bp)
}
}
- return 0;
+ return err;
}
static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
@@ -2215,6 +2215,10 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
*/
b44_chip_reset(bp, B44_CHIP_RESET_FULL);
+ /* do a phy reset to test if there is an active phy */
+ if (b44_phy_reset(bp) < 0)
+ bp->phy_addr = B44_PHY_ADDR_NO_PHY;
+
netdev_info(dev, "Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n",
dev->dev_addr);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb
2010-02-20 20:55 [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails Hauke Mehrtens
@ 2010-02-20 20:55 ` Hauke Mehrtens
2010-02-22 23:46 ` David Miller
2010-02-22 23:46 ` [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Hauke Mehrtens @ 2010-02-20 20:55 UTC (permalink / raw)
To: davem; +Cc: zambrano, netdev, Hauke Mehrtens
The conversion in bf0dcbd929faf036f1a4f2918090344d0e249cf5 missed the
new allocation in b44_rx.
This patch was used in OpenWRT for a long time.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
drivers/net/b44.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 71fa0be..bcb6a02 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -809,7 +809,7 @@ static int b44_rx(struct b44 *bp, int budget)
struct sk_buff *copy_skb;
b44_recycle_rx(bp, cons, bp->rx_prod);
- copy_skb = dev_alloc_skb(len + 2);
+ copy_skb = netdev_alloc_skb(bp->dev, len + 2);
if (copy_skb == NULL)
goto drop_it_no_recycle;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails.
2010-02-20 20:55 [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails Hauke Mehrtens
2010-02-20 20:55 ` [PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb Hauke Mehrtens
@ 2010-02-22 23:46 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2010-02-22 23:46 UTC (permalink / raw)
To: hauke; +Cc: zambrano, netdev
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 20 Feb 2010 21:55:25 +0100
> Do a PHY reset to test if there is an active phy and set the PHY address
> to B44_PHY_ADDR_NO_PHY in case of an not active phy. This is needed for
> the Linksys WRTSL54GS and Asus WL-500W.
> This patch was used in OpenWRT for a long time.
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-22 23:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-20 20:55 [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails Hauke Mehrtens
2010-02-20 20:55 ` [PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb Hauke Mehrtens
2010-02-22 23:46 ` David Miller
2010-02-22 23:46 ` [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails David Miller
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).