* [PATCH] net: ethernet: davinci: Fix build breakage
@ 2013-01-21 9:38 Thierry Reding
2013-01-21 18:13 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Thierry Reding @ 2013-01-21 9:38 UTC (permalink / raw)
To: David S. Miller; +Cc: Mugunthan V N, netdev, linux-kernel
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(-)
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;
--
1.8.1.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: davinci: Fix build breakage
2013-01-21 9:38 [PATCH] net: ethernet: davinci: Fix build breakage Thierry Reding
@ 2013-01-21 18:13 ` David Miller
2013-01-21 18:36 ` Thierry Reding
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2013-01-21 18:13 UTC (permalink / raw)
To: thierry.reding; +Cc: mugunthanvnm, netdev, linux-kernel
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: ethernet: davinci: Fix build breakage
2013-01-21 18:13 ` David Miller
@ 2013-01-21 18:36 ` Thierry Reding
0 siblings, 0 replies; 3+ messages in thread
From: Thierry Reding @ 2013-01-21 18:36 UTC (permalink / raw)
To: David Miller; +Cc: mugunthanvnm, netdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-21 18:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-21 9:38 [PATCH] net: ethernet: davinci: Fix build breakage Thierry Reding
2013-01-21 18:13 ` David Miller
2013-01-21 18:36 ` Thierry Reding
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).