aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/znet.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:58 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:14:07 -0400
commit61357325f377889a1daffa14962d705dc814dd0e (patch)
tree7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/znet.c
parentd0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff)
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: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/znet.c')
-rw-r--r--drivers/net/znet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 7f9e14131a5c..a0384b6f09b6 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -156,7 +156,8 @@ struct netidblk {
156}; 156};
157 157
158static int znet_open(struct net_device *dev); 158static int znet_open(struct net_device *dev);
159static int znet_send_packet(struct sk_buff *skb, struct net_device *dev); 159static netdev_tx_t znet_send_packet(struct sk_buff *skb,
160 struct net_device *dev);
160static irqreturn_t znet_interrupt(int irq, void *dev_id); 161static irqreturn_t znet_interrupt(int irq, void *dev_id);
161static void znet_rx(struct net_device *dev); 162static void znet_rx(struct net_device *dev);
162static int znet_close(struct net_device *dev); 163static int znet_close(struct net_device *dev);
@@ -534,7 +535,7 @@ static void znet_tx_timeout (struct net_device *dev)
534 netif_wake_queue (dev); 535 netif_wake_queue (dev);
535} 536}
536 537
537static int znet_send_packet(struct sk_buff *skb, struct net_device *dev) 538static netdev_tx_t znet_send_packet(struct sk_buff *skb, struct net_device *dev)
538{ 539{
539 int ioaddr = dev->base_addr; 540 int ioaddr = dev->base_addr;
540 struct znet_private *znet = netdev_priv(dev); 541 struct znet_private *znet = netdev_priv(dev);