diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:28 -0400 |
commit | d71a674922e7519edb477ecb585e7d29d69c7aa7 (patch) | |
tree | 816f6936957d5dbe2670079f64bdbd1f52cec00d /drivers/net/wan/sbni.c | |
parent | 61a84108547c1c017683f15311ccbede249fc6fa (diff) |
wan: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/sbni.c')
-rw-r--r-- | drivers/net/wan/sbni.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 85c02a2ec2e7..1cc24a45f003 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -114,7 +114,8 @@ static int sbni_pci_probe( struct net_device * ); | |||
114 | static struct net_device *sbni_probe1(struct net_device *, unsigned long, int); | 114 | static struct net_device *sbni_probe1(struct net_device *, unsigned long, int); |
115 | static int sbni_open( struct net_device * ); | 115 | static int sbni_open( struct net_device * ); |
116 | static int sbni_close( struct net_device * ); | 116 | static int sbni_close( struct net_device * ); |
117 | static int sbni_start_xmit( struct sk_buff *, struct net_device * ); | 117 | static netdev_tx_t sbni_start_xmit(struct sk_buff *, |
118 | struct net_device * ); | ||
118 | static int sbni_ioctl( struct net_device *, struct ifreq *, int ); | 119 | static int sbni_ioctl( struct net_device *, struct ifreq *, int ); |
119 | static void set_multicast_list( struct net_device * ); | 120 | static void set_multicast_list( struct net_device * ); |
120 | 121 | ||
@@ -444,7 +445,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) | |||
444 | 445 | ||
445 | #ifdef CONFIG_SBNI_MULTILINE | 446 | #ifdef CONFIG_SBNI_MULTILINE |
446 | 447 | ||
447 | static int | 448 | static netdev_tx_t |
448 | sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) | 449 | sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) |
449 | { | 450 | { |
450 | struct net_device *p; | 451 | struct net_device *p; |
@@ -472,7 +473,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
472 | 473 | ||
473 | #else /* CONFIG_SBNI_MULTILINE */ | 474 | #else /* CONFIG_SBNI_MULTILINE */ |
474 | 475 | ||
475 | static int | 476 | static netdev_tx_t |
476 | sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) | 477 | sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) |
477 | { | 478 | { |
478 | struct net_local *nl = netdev_priv(dev); | 479 | struct net_local *nl = netdev_priv(dev); |