Subject: Re: linux-next: net tree build failure

From: David Miller <[email-masked]>
Date: Wed, 17 Jun 2009 01:36:58 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Wed, 17 Jun 2009 16:31:12 +1000

> Today's linux-next build (m68k defconfig) failed like this:
> 
> drivers/net/sonic.c: In function 'sonic_send_packet':
> drivers/net/sonic.c:227: error: expected ';' before '}' token
> 
> Caused by commit 5b548140225c6bbbbd560551dd1048b2c0ce58be ("net: use
> symbolic values for ndo_start_xmit() return codes") which lost a
> semicolon in drivers/net/sonic.c.

I just pushed the following fix, thanks!

sonic: Fix build after ndo_start_xmit() changes.

Noticed by Stephen Rothwell.

Signed-off-by: David S. Miller <[email-masked]>
---
 drivers/net/sonic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c
index e4255d8..753a1fb 100644
--- a/drivers/net/sonic.c
+++ b/drivers/net/sonic.c
@@ -223,7 +223,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
 	if (!laddr) {
 		printk(KERN_ERR "%s: failed to map tx DMA buffer.\n", dev->name);
 		dev_kfree_skb(skb);
-		return NETDEV_TX_BUSY
+		return NETDEV_TX_BUSY;
 	}
 
 	sonic_tda_put(dev, entry, SONIC_TD_STATUS, 0);       /* clear status */
-- 
1.6.3.2