aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hamradio/scc.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:43 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:12 -0400
commit36e4d64a82d9a91a73a2b9b32117aedfe2211fb3 (patch)
tree67996382bbbd97503c65680ee6fa4d7520156d4f /drivers/net/hamradio/scc.c
parent3c805a22a3a178fc5aaadd518afa5358b78bf69e (diff)
convert hamradio drivers to netdev_txreturnt_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio/scc.c')
-rw-r--r--drivers/net/hamradio/scc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index c5406525c1a..35c936175bb 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -209,7 +209,8 @@ static void scc_net_setup(struct net_device *dev);
209static int scc_net_open(struct net_device *dev); 209static int scc_net_open(struct net_device *dev);
210static int scc_net_close(struct net_device *dev); 210static int scc_net_close(struct net_device *dev);
211static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb); 211static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb);
212static int scc_net_tx(struct sk_buff *skb, struct net_device *dev); 212static netdev_tx_t scc_net_tx(struct sk_buff *skb,
213 struct net_device *dev);
213static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); 214static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
214static int scc_net_set_mac_address(struct net_device *dev, void *addr); 215static int scc_net_set_mac_address(struct net_device *dev, void *addr);
215static struct net_device_stats * scc_net_get_stats(struct net_device *dev); 216static struct net_device_stats * scc_net_get_stats(struct net_device *dev);
@@ -1634,7 +1635,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
1634 1635
1635/* ----> transmit frame <---- */ 1636/* ----> transmit frame <---- */
1636 1637
1637static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) 1638static netdev_tx_t scc_net_tx(struct sk_buff *skb, struct net_device *dev)
1638{ 1639{
1639 struct scc_channel *scc = (struct scc_channel *) dev->ml_priv; 1640 struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;
1640 unsigned long flags; 1641 unsigned long flags;