Patchwork net: ethernet: davinci: Fix build breakage

login
register
mail settings
Submitter Thierry Reding
Date Jan. 21, 2013, 9:38 a.m.
Message ID <1358761119-25846-1-git-send-email-thierry.reding@avionic-design.de>
Download mbox | patch
Permalink /patch/214056/
State Accepted
Delegated to: David Miller
Headers show

Comments

Thierry Reding - Jan. 21, 2013, 9:38 a.m.
The correct name of the transmit DMA channel field in struct emac_priv
is txchan, not txch.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
 drivers/net/ethernet/ti/davinci_emac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Miller - Jan. 21, 2013, 6:13 p.m.
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Mon, 21 Jan 2013 10:38:39 +0100

> The correct name of the transmit DMA channel field in struct emac_priv
> is txchan, not txch.
> 
> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>

Nothing is more irritating than someone not saying what tree their
patch is targetted for.  My time is not well used by playing a
guessing game about where a patch is supposed to go.

After some futzing around I was able to determine that this patch
is needed for net-next only, but please make a specific mention of
this next time.

Applied, thanks.
--
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
Thierry Reding - Jan. 21, 2013, 6:36 p.m.
On Mon, Jan 21, 2013 at 01:13:14PM -0500, David Miller wrote:
> From: Thierry Reding <thierry.reding@avionic-design.de>
> Date: Mon, 21 Jan 2013 10:38:39 +0100
> 
> > The correct name of the transmit DMA channel field in struct emac_priv
> > is txchan, not txch.
> > 
> > Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
> 
> Nothing is more irritating than someone not saying what tree their
> patch is targetted for.  My time is not well used by playing a
> guessing game about where a patch is supposed to go.
> 
> After some futzing around I was able to determine that this patch
> is needed for net-next only, but please make a specific mention of
> this next time.

I'm sorry about that. I'll make a mental note to think of it next time.

Thierry

Patch

diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
index 1c97c81..242ec55 100644
--- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1102,7 +1102,7 @@  static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)
 	/* If there is no more tx desc left free then we need to
 	 * tell the kernel to stop sending us tx frames.
 	 */
-	if (unlikely(cpdma_check_free_tx_desc(priv->txch)))
+	if (unlikely(cpdma_check_free_tx_desc(priv->txchan)))
 		netif_stop_queue(ndev);
 
 	return NETDEV_TX_OK;