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 | |
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')
-rw-r--r-- | drivers/net/hamradio/6pack.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/bpqether.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 3 | ||||
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 2 | ||||
-rw-r--r-- | drivers/net/hamradio/scc.c | 5 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 3 |
6 files changed, 10 insertions, 7 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 6cb2bdfd7b19..fb588301a05d 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
@@ -242,7 +242,7 @@ out_drop: | |||
242 | 242 | ||
243 | /* Encapsulate an IP datagram and kick it into a TTY queue. */ | 243 | /* Encapsulate an IP datagram and kick it into a TTY queue. */ |
244 | 244 | ||
245 | static int sp_xmit(struct sk_buff *skb, struct net_device *dev) | 245 | static netdev_tx_t sp_xmit(struct sk_buff *skb, struct net_device *dev) |
246 | { | 246 | { |
247 | struct sixpack *sp = netdev_priv(dev); | 247 | struct sixpack *sp = netdev_priv(dev); |
248 | 248 | ||
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 4c5f4dfbe05e..3c7cc7f45800 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
@@ -247,7 +247,7 @@ drop: | |||
247 | /* | 247 | /* |
248 | * Send an AX.25 frame via an ethernet interface | 248 | * Send an AX.25 frame via an ethernet interface |
249 | */ | 249 | */ |
250 | static int bpq_xmit(struct sk_buff *skb, struct net_device *dev) | 250 | static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev) |
251 | { | 251 | { |
252 | struct sk_buff *newskb; | 252 | struct sk_buff *newskb; |
253 | unsigned char *ptr; | 253 | unsigned char *ptr; |
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 16b060b92117..0013c409782c 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
@@ -399,7 +399,8 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s) | |||
399 | * ===================== network driver interface ========================= | 399 | * ===================== network driver interface ========================= |
400 | */ | 400 | */ |
401 | 401 | ||
402 | static int hdlcdrv_send_packet(struct sk_buff *skb, struct net_device *dev) | 402 | static netdev_tx_t hdlcdrv_send_packet(struct sk_buff *skb, |
403 | struct net_device *dev) | ||
403 | { | 404 | { |
404 | struct hdlcdrv_state *sm = netdev_priv(dev); | 405 | struct hdlcdrv_state *sm = netdev_priv(dev); |
405 | 406 | ||
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index ac191ef2119b..33b55f729742 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -525,7 +525,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len) | |||
525 | } | 525 | } |
526 | 526 | ||
527 | /* Encapsulate an AX.25 packet and kick it into a TTY queue. */ | 527 | /* Encapsulate an AX.25 packet and kick it into a TTY queue. */ |
528 | static int ax_xmit(struct sk_buff *skb, struct net_device *dev) | 528 | static netdev_tx_t ax_xmit(struct sk_buff *skb, struct net_device *dev) |
529 | { | 529 | { |
530 | struct mkiss *ax = netdev_priv(dev); | 530 | struct mkiss *ax = netdev_priv(dev); |
531 | 531 | ||
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index c5406525c1ad..35c936175bba 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; |
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index b85aa162314e..694132e04af6 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -594,7 +594,8 @@ static void ptt_off(struct net_device *dev) | |||
594 | outb(PTT_OFF, MCR(dev->base_addr)); | 594 | outb(PTT_OFF, MCR(dev->base_addr)); |
595 | } | 595 | } |
596 | 596 | ||
597 | static int yam_send_packet(struct sk_buff *skb, struct net_device *dev) | 597 | static netdev_tx_t yam_send_packet(struct sk_buff *skb, |
598 | struct net_device *dev) | ||
598 | { | 599 | { |
599 | struct yam_port *yp = netdev_priv(dev); | 600 | struct yam_port *yp = netdev_priv(dev); |
600 | 601 | ||