Message ID | 392fb48f0907211751k6bbbb6base944c6b7d80a3bf5@mail.gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 22 Jul 2009 09:51:20 +0900 Mike McCormack <mikem@ring3k.org> wrote: > Signed-off-by: Mike McCormack <mikem@ring3k.org> > --- > drivers/net/sky2.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c > index 3550c5d..661abd0 100644 > --- a/drivers/net/sky2.c > +++ b/drivers/net/sky2.c > @@ -4117,7 +4117,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v) > > seq_printf(seq, "\nRx ring hw get=%d put=%d last=%d\n", > sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_GET_IDX)), > - last = sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)), > + sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)), > sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_LAST_IDX))); > > sky2_read32(hw, B0_Y2_SP_LISR); Acked-by: Stephen Hemminger <shemminger@vyatta.com>
On Wed, 22 Jul 2009 09:51:20 +0900 Mike McCormack <mikem@ring3k.org> wrote: > Signed-off-by: Mike McCormack <mikem@ring3k.org> > --- > drivers/net/sky2.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c > index 3550c5d..661abd0 100644 > --- a/drivers/net/sky2.c > +++ b/drivers/net/sky2.c > @@ -4117,7 +4117,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v) > > seq_printf(seq, "\nRx ring hw get=%d put=%d last=%d\n", > sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_GET_IDX)), > - last = sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)), > + sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)), > sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_LAST_IDX))); > > sky2_read32(hw, B0_Y2_SP_LISR); Acked-by: Stephen Hemminger <shemminger@vyatta.com>
From: Stephen Hemminger <shemminger@vyatta.com> Date: Wed, 22 Jul 2009 09:59:33 -0700 > On Wed, 22 Jul 2009 09:51:20 +0900 > Mike McCormack <mikem@ring3k.org> wrote: > >> Signed-off-by: Mike McCormack <mikem@ring3k.org> ... > Acked-by: Stephen Hemminger <shemminger@vyatta.com> Applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 3550c5d..661abd0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4117,7 +4117,7 @@ static int sky2_debug_show(struct seq_file *seq, void *v) seq_printf(seq, "\nRx ring hw get=%d put=%d last=%d\n", sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_GET_IDX)), - last = sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)), + sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_PUT_IDX)), sky2_read16(hw, Y2_QADDR(rxqaddr[port], PREF_UNIT_LAST_IDX))); sky2_read32(hw, B0_Y2_SP_LISR);
Signed-off-by: Mike McCormack <mikem@ring3k.org> --- drivers/net/sky2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)