From e157281c5dd3b0e2f4abe24a633bd33c2181730a Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 2 Mar 2010 13:36:09 +0000 Subject: [PATCH] ar71xx: ag71xx: use NETDEV_TX_OK SVN-Revision: 19948 --- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h | 2 +- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 139fc9455a6d..712e9f1ecd05 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h @@ -38,7 +38,7 @@ #define ETH_FCS_LEN 4 #define AG71XX_DRV_NAME "ag71xx" -#define AG71XX_DRV_VERSION "0.5.25" +#define AG71XX_DRV_VERSION "0.5.26" #define AG71XX_NAPI_WEIGHT 64 #define AG71XX_OOM_REFILL (1 + HZ/10) diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c index 64b5cc8e045c..a8be41b52d90 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -491,7 +491,8 @@ static int ag71xx_stop(struct net_device *dev) return 0; } -static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, + struct net_device *dev) { struct ag71xx *ag = netdev_priv(dev); struct ag71xx_ring *ring = &ag->tx_ring; @@ -535,13 +536,13 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; - return 0; + return NETDEV_TX_OK; err_drop: dev->stats.tx_dropped++; dev_kfree_skb(skb); - return 0; + return NETDEV_TX_OK; } static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) -- 2.30.2