* [PATCH] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
@ 2009-09-21 14:08 Mike McCormack
2009-09-22 2:50 ` Stephen Hemminger
2009-09-22 21:21 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Mike McCormack @ 2009-09-21 14:08 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
The SKY2_HW_RAM_BUFFER bit in hw->flags was checked in sky2_mac_init(),
before being set later in sky2_up().
Setting SKY2_HW_RAM_BUFFER in sky2_init() where other hw->flags are set
should avoid this problem recurring.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
---
drivers/net/sky2.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 4bb52e9..68d256b 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1497,7 +1497,6 @@ static int sky2_up(struct net_device *dev)
if (ramsize > 0) {
u32 rxspace;
- hw->flags |= SKY2_HW_RAM_BUFFER;
pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
if (ramsize < 16)
rxspace = ramsize / 2;
@@ -2926,6 +2925,9 @@ static int __devinit sky2_init(struct sky2_hw *hw)
++hw->ports;
}
+ if (sky2_read8(hw, B2_E_0))
+ hw->flags |= SKY2_HW_RAM_BUFFER;
+
return 0;
}
--
1.5.6.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
2009-09-21 14:08 [PATCH] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init Mike McCormack
@ 2009-09-22 2:50 ` Stephen Hemminger
2009-09-22 21:21 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2009-09-22 2:50 UTC (permalink / raw)
To: Mike McCormack, David Miller; +Cc: netdev
On Mon, 21 Sep 2009 23:08:52 +0900
Mike McCormack <mikem@ring3k.org> wrote:
> The SKY2_HW_RAM_BUFFER bit in hw->flags was checked in sky2_mac_init(),
> before being set later in sky2_up().
>
> Setting SKY2_HW_RAM_BUFFER in sky2_init() where other hw->flags are set
> should avoid this problem recurring.
>
> Signed-off-by: Mike McCormack <mikem@ring3k.org>
> ---
> drivers/net/sky2.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
> index 4bb52e9..68d256b 100644
> --- a/drivers/net/sky2.c
> +++ b/drivers/net/sky2.c
> @@ -1497,7 +1497,6 @@ static int sky2_up(struct net_device *dev)
> if (ramsize > 0) {
> u32 rxspace;
>
> - hw->flags |= SKY2_HW_RAM_BUFFER;
> pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
> if (ramsize < 16)
> rxspace = ramsize / 2;
> @@ -2926,6 +2925,9 @@ static int __devinit sky2_init(struct sky2_hw *hw)
> ++hw->ports;
> }
>
> + if (sky2_read8(hw, B2_E_0))
> + hw->flags |= SKY2_HW_RAM_BUFFER;
> +
> return 0;
> }
>
This should go to stable tree as well.
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
--
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init
2009-09-21 14:08 [PATCH] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init Mike McCormack
2009-09-22 2:50 ` Stephen Hemminger
@ 2009-09-22 21:21 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2009-09-22 21:21 UTC (permalink / raw)
To: mikem; +Cc: shemminger, netdev
From: Mike McCormack <mikem@ring3k.org>
Date: Mon, 21 Sep 2009 23:08:52 +0900
> The SKY2_HW_RAM_BUFFER bit in hw->flags was checked in sky2_mac_init(),
> before being set later in sky2_up().
>
> Setting SKY2_HW_RAM_BUFFER in sky2_init() where other hw->flags are set
> should avoid this problem recurring.
>
> Signed-off-by: Mike McCormack <mikem@ring3k.org>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-22 21:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-21 14:08 [PATCH] sky2: Set SKY2_HW_RAM_BUFFER in sky2_init Mike McCormack
2009-09-22 2:50 ` Stephen Hemminger
2009-09-22 21:21 ` 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).