Commit 36e4d64a authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

convert hamradio drivers to netdev_txreturnt_t

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c805a22
...@@ -242,7 +242,7 @@ static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len) ...@@ -242,7 +242,7 @@ static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len)
/* Encapsulate an IP datagram and kick it into a TTY queue. */ /* Encapsulate an IP datagram and kick it into a TTY queue. */
static int sp_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t sp_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct sixpack *sp = netdev_priv(dev); struct sixpack *sp = netdev_priv(dev);
......
...@@ -247,7 +247,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty ...@@ -247,7 +247,7 @@ static int bpq_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ty
/* /*
* Send an AX.25 frame via an ethernet interface * Send an AX.25 frame via an ethernet interface
*/ */
static int bpq_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t bpq_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct sk_buff *newskb; struct sk_buff *newskb;
unsigned char *ptr; unsigned char *ptr;
......
...@@ -399,7 +399,8 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s) ...@@ -399,7 +399,8 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s)
* ===================== network driver interface ========================= * ===================== network driver interface =========================
*/ */
static int hdlcdrv_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t hdlcdrv_send_packet(struct sk_buff *skb,
struct net_device *dev)
{ {
struct hdlcdrv_state *sm = netdev_priv(dev); struct hdlcdrv_state *sm = netdev_priv(dev);
......
...@@ -525,7 +525,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len) ...@@ -525,7 +525,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
} }
/* Encapsulate an AX.25 packet and kick it into a TTY queue. */ /* Encapsulate an AX.25 packet and kick it into a TTY queue. */
static int ax_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t ax_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct mkiss *ax = netdev_priv(dev); struct mkiss *ax = netdev_priv(dev);
......
...@@ -209,7 +209,8 @@ static void scc_net_setup(struct net_device *dev); ...@@ -209,7 +209,8 @@ static void scc_net_setup(struct net_device *dev);
static int scc_net_open(struct net_device *dev); static int scc_net_open(struct net_device *dev);
static int scc_net_close(struct net_device *dev); static int scc_net_close(struct net_device *dev);
static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb); static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb);
static int scc_net_tx(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t scc_net_tx(struct sk_buff *skb,
struct net_device *dev);
static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
static int scc_net_set_mac_address(struct net_device *dev, void *addr); static int scc_net_set_mac_address(struct net_device *dev, void *addr);
static struct net_device_stats * scc_net_get_stats(struct net_device *dev); 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,7 +1635,7 @@ static void scc_net_rx(struct scc_channel *scc, struct sk_buff *skb)
/* ----> transmit frame <---- */ /* ----> transmit frame <---- */
static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t scc_net_tx(struct sk_buff *skb, struct net_device *dev)
{ {
struct scc_channel *scc = (struct scc_channel *) dev->ml_priv; struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;
unsigned long flags; unsigned long flags;
......
...@@ -594,7 +594,8 @@ static void ptt_off(struct net_device *dev) ...@@ -594,7 +594,8 @@ static void ptt_off(struct net_device *dev)
outb(PTT_OFF, MCR(dev->base_addr)); outb(PTT_OFF, MCR(dev->base_addr));
} }
static int yam_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t yam_send_packet(struct sk_buff *skb,
struct net_device *dev)
{ {
struct yam_port *yp = netdev_priv(dev); struct yam_port *yp = netdev_priv(dev);
......
...@@ -169,7 +169,7 @@ static int nr_close(struct net_device *dev) ...@@ -169,7 +169,7 @@ static int nr_close(struct net_device *dev)
return 0; return 0;
} }
static int nr_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t nr_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net_device_stats *stats = &dev->stats; struct net_device_stats *stats = &dev->stats;
unsigned int len = skb->len; unsigned int len = skb->len;
......
...@@ -131,7 +131,7 @@ static int rose_close(struct net_device *dev) ...@@ -131,7 +131,7 @@ static int rose_close(struct net_device *dev)
return 0; return 0;
} }
static int rose_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t rose_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net_device_stats *stats = &dev->stats; struct net_device_stats *stats = &dev->stats;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment