[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <48FD657B.7060307@pobox.com>
Date: Tue, 21 Oct 2008 01:15:39 -0400
From: Jeff Garzik <jgarzik@...ox.com>
To: Dmitry Baryshkov <dbaryshkov@...il.com>
CC: netdev@...r.kernel.org, Eric Miao <eric.miao@...vell.com>
Subject: Re: [PATCH] SMC911x: unbreak PXA builds
Dmitry Baryshkov wrote:
> Currently SMC911x driver is broken on ARM/PXA builds.
> Unbreak such configurations.
>
> Signed-off-by: Dmitry Baryshkov <dbaryshkov@...il.com>
> ---
> drivers/net/smc911x.c | 2 +-
> drivers/net/smc911x.h | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
> index ddcefde..402fd06 100644
> --- a/drivers/net/smc911x.c
> +++ b/drivers/net/smc911x.c
> @@ -1241,7 +1241,7 @@ smc911x_rx_dma_irq(int dma, void *data)
> netif_rx(skb);
>
> spin_lock_irqsave(&lp->lock, flags);
> - pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16;
> + pkts = (SMC_GET_RX_FIFO_INF(lp) & RX_FIFO_INF_RXSUSED_) >> 16;
> if (pkts != 0) {
> smc911x_rcv(dev);
> }else {
> diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
> index bf6240f..cc7d85b 100644
> --- a/drivers/net/smc911x.h
> +++ b/drivers/net/smc911x.h
> @@ -50,6 +50,10 @@
> #define SMC_DYNAMIC_BUS_CONFIG
> #endif
>
> +#ifdef SMC_USE_PXA_DMA
> +#define SMC_USE_DMA
> +#endif
> +
> /* store this information for the driver.. */
> struct smc911x_local {
> /*
> @@ -196,8 +200,6 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg,
>
>
> #ifdef SMC_USE_PXA_DMA
> -#define SMC_USE_DMA
applied
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists