UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

convert hamradio drivers to netdev_txreturnt_t 

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-08-31 19:50:43 +00:00 committed by David S. Miller
parent 3c805a22a3
commit 36e4d64a82
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/hamradio/6pack.c
View File

@ -242,7 +242,7 @@ out_drop:
/* 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);

2
drivers/net/hamradio/bpqether.c
View File

@ -247,7 +247,7 @@ drop:
/* /*
* 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;

3
drivers/net/hamradio/hdlcdrv.c
View File

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

2
drivers/net/hamradio/mkiss.c
View File

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

5
drivers/net/hamradio/scc.c
View File

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

3
drivers/net/hamradio/yam.c
View File

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

2
net/netrom/nr_dev.c
View File

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

2
net/rose/rose_dev.c
View File

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