Commit 61357325 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

netdev: convert bulk of drivers to netdev_tx_t 



In a couple of cases collapse some extra code like:
   int retval = NETDEV_TX_OK;
   ...
   return retval;
into
   return NETDEV_TX_OK;

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0cf9c0d

drivers/ieee802154/fakehard.c

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ static int ieee802154_fake_close(struct net_device *dev) 
	return 0;

}



static int ieee802154_fake_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t ieee802154_fake_xmit(struct sk_buff *skb,

					      struct net_device *dev)

{

	skb->iif = dev->ifindex;

	skb->dev = dev;

drivers/net/8139cp.c

+2 −1
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ static void cp_tx (struct cp_private *cp) 
		netif_wake_queue(cp->dev);

}



static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t cp_start_xmit (struct sk_buff *skb,

					struct net_device *dev)

{

	struct cp_private *cp = netdev_priv(dev);

	unsigned entry;

drivers/net/8139too.c

+4 −3
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static void mdio_write (struct net_device *dev, int phy_id, int location, 
static void rtl8139_start_thread(struct rtl8139_private *tp);

static void rtl8139_tx_timeout (struct net_device *dev);

static void rtl8139_init_ring (struct net_device *dev);

static int rtl8139_start_xmit (struct sk_buff *skb,

static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,

				       struct net_device *dev);

#ifdef CONFIG_NET_POLL_CONTROLLER

static void rtl8139_poll_controller(struct net_device *dev);
@@ -1687,7 +1687,8 @@ static void rtl8139_tx_timeout (struct net_device *dev) 
	}

}



static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t rtl8139_start_xmit (struct sk_buff *skb,

					     struct net_device *dev)

{

	struct rtl8139_private *tp = netdev_priv(dev);

	void __iomem *ioaddr = tp->mmio_addr;

drivers/net/82596.c

+2 −3
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static char init_setup[] = 
	0x7f /*  *multi IA */ };



static int i596_open(struct net_device *dev);

static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev);

static irqreturn_t i596_interrupt(int irq, void *dev_id);

static int i596_close(struct net_device *dev);

static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd);
@@ -1054,8 +1054,7 @@ static void i596_tx_timeout (struct net_device *dev) 
	netif_wake_queue (dev);

}





static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct i596_private *lp = dev->ml_priv;

	struct tx_cmd *tx_cmd;

drivers/net/8390.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ int ei_close(struct net_device *dev) 
}

EXPORT_SYMBOL(ei_close);



int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)

netdev_tx_t ei_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	return __ei_start_xmit(skb, dev);

}