Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 36e4d64a82d9a91a73a2b9b32117aedfe2211fb3

Authored by Stephen Hemminger
Committed by David S. Miller
1 parent 3c805a22a3

convert hamradio drivers to netdev_txreturnt_t 

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 8 changed files with 12 additions and 9 deletions Side-by-side Diff

drivers/net/hamradio/6pack.c
Diff comments   View file @ 36e4d64
... ... @@ -242,7 +242,7 @@
242 242  
243 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 247 struct sixpack *sp = netdev_priv(dev);
248 248  
drivers/net/hamradio/bpqether.c
Diff comments   View file @ 36e4d64
... ... @@ -247,7 +247,7 @@
247 247 /*
248 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 252 struct sk_buff *newskb;
253 253 unsigned char *ptr;
drivers/net/hamradio/hdlcdrv.c
Diff comments   View file @ 36e4d64
... ... @@ -399,7 +399,8 @@
399 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 405 struct hdlcdrv_state *sm = netdev_priv(dev);
405 406  
drivers/net/hamradio/mkiss.c
Diff comments   View file @ 36e4d64
... ... @@ -525,7 +525,7 @@
525 525 }
526 526  
527 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 530 struct mkiss *ax = netdev_priv(dev);
531 531  
drivers/net/hamradio/scc.c
Diff comments   View file @ 36e4d64
... ... @@ -209,7 +209,8 @@
209 209 static int scc_net_open(struct net_device *dev);
210 210 static int scc_net_close(struct net_device *dev);
211 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 214 static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
214 215 static int scc_net_set_mac_address(struct net_device *dev, void *addr);
215 216 static struct net_device_stats * scc_net_get_stats(struct net_device *dev);
... ... @@ -1634,7 +1635,7 @@
1634 1635  
1635 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 1640 struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;
1640 1641 unsigned long flags;
drivers/net/hamradio/yam.c
Diff comments   View file @ 36e4d64
... ... @@ -594,7 +594,8 @@
594 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 600 struct yam_port *yp = netdev_priv(dev);
600 601  
... ... @@ -169,7 +169,7 @@
169 169 return 0;
170 170 }
171 171  
172   -static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
  172 +static netdev_tx_t nr_xmit(struct sk_buff *skb, struct net_device *dev)
173 173 {
174 174 struct net_device_stats *stats = &dev->stats;
175 175 unsigned int len = skb->len;
... ... @@ -131,7 +131,7 @@
131 131 return 0;
132 132 }
133 133  
134   -static int rose_xmit(struct sk_buff *skb, struct net_device *dev)
  134 +static netdev_tx_t rose_xmit(struct sk_buff *skb, struct net_device *dev)
135 135 {
136 136 struct net_device_stats *stats = &dev->stats;
137 137