Message ID | 392fb48f0908030407j69f32c6qed9529f1219ee474@mail.gmail.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
I agree this is good, but more explanation in the commit log would be helpful
as a record.
Note: the unwind code should not ever be called on x86, since dma_mapping always
succeeds.
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
--
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
On Mon, 3 Aug 2009 20:07:58 +0900 Mike McCormack <mikem@ring3k.org> wrote: > --- > drivers/net/sky2.c | 34 ++++++++++++++++++---------------- > 1 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c > index 661abd0..16a359d 100644 > --- a/drivers/net/sky2.c > +++ b/drivers/net/sky2.c > @@ -989,11 +989,11 @@ static void sky2_prefetch_init(struct sky2_hw > *hw, u32 qaddr, > sky2_read32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL)); Your mailer line wrapped the patch making it not apply! -- 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 661abd0..16a359d 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -989,11 +989,11 @@ static void sky2_prefetch_init(struct sky2_hw *hw, u32 qaddr, sky2_read32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL)); } -static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2) +static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2, u16 *slot) { - struct sky2_tx_le *le = sky2->tx_le + sky2->tx_prod; + struct sky2_tx_le *le = sky2->tx_le + *slot; - sky2->tx_prod = RING_NEXT(sky2->tx_prod, TX_RING_SIZE); + *slot = RING_NEXT(*slot, TX_RING_SIZE); le->ctrl = 0; return le;