Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4c5d502d8b2db8947c44dc44bdc67dbe55cce2b9

Authored by Stephen Hemminger
Committed by David S. Miller
1 parent d71a674922

hdlc: convert to netdev_tx_t 

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

Showing 5 changed files with 16 additions and 20 deletions Side-by-side Diff

drivers/char/pcmcia/synclink_cs.c
Diff comments   View file @ 4c5d502
... ... @@ -4005,10 +4005,9 @@
4005 4005 *
4006 4006 * skb socket buffer containing HDLC frame
4007 4007 * dev pointer to network device structure
4008   - *
4009   - * returns 0 if success, otherwise error code
4010 4008 */
4011   -static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
  4009 +static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
  4010 + struct net_device *dev)
4012 4011 {
4013 4012 MGSLPC_INFO *info = dev_to_port(dev);
4014 4013 unsigned long flags;
... ... @@ -4043,7 +4042,7 @@
4043 4042 }
4044 4043 spin_unlock_irqrestore(&info->lock,flags);
4045 4044  
4046   - return 0;
  4045 + return NETDEV_TX_OK;
4047 4046 }
4048 4047  
4049 4048 /**
drivers/char/synclink.c
Diff comments   View file @ 4c5d502
... ... @@ -7697,10 +7697,9 @@
7697 7697 *
7698 7698 * skb socket buffer containing HDLC frame
7699 7699 * dev pointer to network device structure
7700   - *
7701   - * returns 0 if success, otherwise error code
7702 7700 */
7703   -static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
  7701 +static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
  7702 + struct net_device *dev)
7704 7703 {
7705 7704 struct mgsl_struct *info = dev_to_port(dev);
7706 7705 unsigned long flags;
... ... @@ -7731,7 +7730,7 @@
7731 7730 usc_start_transmitter(info);
7732 7731 spin_unlock_irqrestore(&info->irq_spinlock,flags);
7733 7732  
7734   - return 0;
  7733 + return NETDEV_TX_OK;
7735 7734 }
7736 7735  
7737 7736 /**
drivers/char/synclink_gt.c
Diff comments   View file @ 4c5d502
... ... @@ -1497,10 +1497,9 @@
1497 1497 *
1498 1498 * skb socket buffer containing HDLC frame
1499 1499 * dev pointer to network device structure
1500   - *
1501   - * returns 0 if success, otherwise error code
1502 1500 */
1503   -static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
  1501 +static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
  1502 + struct net_device *dev)
1504 1503 {
1505 1504 struct slgt_info *info = dev_to_port(dev);
1506 1505 unsigned long flags;
... ... @@ -1529,7 +1528,7 @@
1529 1528 update_tx_timer(info);
1530 1529 spin_unlock_irqrestore(&info->lock,flags);
1531 1530  
1532   - return 0;
  1531 + return NETDEV_TX_OK;
1533 1532 }
1534 1533  
1535 1534 /**
drivers/char/synclinkmp.c
Diff comments   View file @ 4c5d502
... ... @@ -1608,10 +1608,9 @@
1608 1608 *
1609 1609 * skb socket buffer containing HDLC frame
1610 1610 * dev pointer to network device structure
1611   - *
1612   - * returns 0 if success, otherwise error code
1613 1611 */
1614   -static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
  1612 +static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
  1613 + struct net_device *dev)
1615 1614 {
1616 1615 SLMP_INFO *info = dev_to_port(dev);
1617 1616 unsigned long flags;
... ... @@ -1642,7 +1641,7 @@
1642 1641 tx_start(info);
1643 1642 spin_unlock_irqrestore(&info->lock,flags);
1644 1643  
1645   - return 0;
  1644 + return NETDEV_TX_OK;
1646 1645 }
1647 1646  
1648 1647 /**
include/linux/hdlc.h
Diff comments   View file @ 4c5d502
... ... @@ -38,7 +38,7 @@
38 38 int (*ioctl)(struct net_device *dev, struct ifreq *ifr);
39 39 __be16 (*type_trans)(struct sk_buff *skb, struct net_device *dev);
40 40 int (*netif_rx)(struct sk_buff *skb);
41   - int (*xmit)(struct sk_buff *skb, struct net_device *dev);
  41 + netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);
42 42 struct module *module;
43 43 struct hdlc_proto *next; /* next protocol in the list */
44 44 };
... ... @@ -51,7 +51,7 @@
51 51 unsigned short encoding, unsigned short parity);
52 52  
53 53 /* hardware driver must handle this instead of dev->hard_start_xmit */
54   - int (*xmit)(struct sk_buff *skb, struct net_device *dev);
  54 + netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);
55 55  
56 56 /* Things below are for HDLC layer internal use only */
57 57 const struct hdlc_proto *proto;
... ... @@ -60,7 +60,7 @@
60 60 spinlock_t state_lock;
61 61 void *state;
62 62 void *priv;
63   -}hdlc_device;
  63 +} hdlc_device;
64 64  
65 65  
66 66  
... ... @@ -106,7 +106,7 @@
106 106 /* May be used by hardware driver */
107 107 int hdlc_change_mtu(struct net_device *dev, int new_mtu);
108 108 /* Must be pointed to by hw driver's dev->netdev_ops->ndo_start_xmit */
109   -int hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);
  109 +netdev_tx_t hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);
110 110  
111 111 int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,
112 112 size_t size);