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

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

drivers/net/hamradio/6pack.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */



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);

drivers/net/hamradio/bpqether.c

+1 −1
Original line number Diff line number Diff line
@@ -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

 */

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;

	unsigned char *ptr;

drivers/net/hamradio/hdlcdrv.c

+2 −1
Original line number Diff line number Diff line
@@ -399,7 +399,8 @@ void hdlcdrv_arbitrate(struct net_device *dev, struct hdlcdrv_state *s) 
 * ===================== 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);

drivers/net/hamradio/mkiss.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */

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);

drivers/net/hamradio/scc.c

+3 −2
Original line number Diff line number Diff line
@@ -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_close(struct net_device *dev);

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_set_mac_address(struct net_device *dev, void *addr);

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) 


/* ----> 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;

	unsigned long flags;