diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:12 -0400 |
commit | 36e4d64a82d9a91a73a2b9b32117aedfe2211fb3 (patch) | |
tree | 67996382bbbd97503c65680ee6fa4d7520156d4f /drivers/net/hamradio/scc.c | |
parent | 3c805a22a3a178fc5aaadd518afa5358b78bf69e (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.c | 5 |
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); | |||
209 | static int scc_net_open(struct net_device *dev); | 209 | static int scc_net_open(struct net_device *dev); |
210 | static int scc_net_close(struct net_device *dev); | 210 | static int scc_net_close(struct net_device *dev); |
211 | static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb); | 211 | static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb); |
212 | static int scc_net_tx(struct sk_buff *skb, struct net_device *dev); | 212 | static netdev_tx_t scc_net_tx(struct sk_buff *skb, |
213 | struct net_device *dev); | ||
213 | static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); | 214 | static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); |
214 | static int scc_net_set_mac_address(struct net_device *dev, void *addr); | 215 | static int scc_net_set_mac_address(struct net_device *dev, void *addr); |
215 | static struct net_device_stats * scc_net_get_stats(struct net_device *dev); | 216 | static 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 | ||
1637 | static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) | 1638 | static 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; |