Commit 4c5d502d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

hdlc: convert to netdev_tx_t 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d71a6749

drivers/char/pcmcia/synclink_cs.c

+3 −4
Original line number Diff line number Diff line
@@ -4005,10 +4005,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
 *

 * skb  socket buffer containing HDLC frame

 * dev  pointer to network device structure

 *

 * returns 0 if success, otherwise error code

 */

static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,

				      struct net_device *dev)

{

	MGSLPC_INFO *info = dev_to_port(dev);

	unsigned long flags;
@@ -4043,7 +4042,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	}

	spin_unlock_irqrestore(&info->lock,flags);



	return 0;

	return NETDEV_TX_OK;

}



/**

drivers/char/synclink.c

+3 −4
Original line number Diff line number Diff line
@@ -7697,10 +7697,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
 *

 * skb  socket buffer containing HDLC frame

 * dev  pointer to network device structure

 *

 * returns 0 if success, otherwise error code

 */

static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,

				      struct net_device *dev)

{

	struct mgsl_struct *info = dev_to_port(dev);

	unsigned long flags;
@@ -7731,7 +7730,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	 	usc_start_transmitter(info);

	spin_unlock_irqrestore(&info->irq_spinlock,flags);



	return 0;

	return NETDEV_TX_OK;

}



/**

drivers/char/synclink_gt.c

+3 −4
Original line number Diff line number Diff line
@@ -1497,10 +1497,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
 *

 * skb  socket buffer containing HDLC frame

 * dev  pointer to network device structure

 *

 * returns 0 if success, otherwise error code

 */

static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,

				      struct net_device *dev)

{

	struct slgt_info *info = dev_to_port(dev);

	unsigned long flags;
@@ -1529,7 +1528,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	update_tx_timer(info);

	spin_unlock_irqrestore(&info->lock,flags);



	return 0;

	return NETDEV_TX_OK;

}



/**

drivers/char/synclinkmp.c

+3 −4
Original line number Diff line number Diff line
@@ -1608,10 +1608,9 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, 
 *

 * skb  socket buffer containing HDLC frame

 * dev  pointer to network device structure

 *

 * returns 0 if success, otherwise error code

 */

static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,

				      struct net_device *dev)

{

	SLMP_INFO *info = dev_to_port(dev);

	unsigned long flags;
@@ -1642,7 +1641,7 @@ static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev) 
	 	tx_start(info);

	spin_unlock_irqrestore(&info->lock,flags);



	return 0;

	return NETDEV_TX_OK;

}



/**

include/linux/hdlc.h

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct hdlc_proto { 
	int (*ioctl)(struct net_device *dev, struct ifreq *ifr);

	__be16 (*type_trans)(struct sk_buff *skb, struct net_device *dev);

	int (*netif_rx)(struct sk_buff *skb);

	int (*xmit)(struct sk_buff *skb, struct net_device *dev);

	netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);

	struct module *module;

	struct hdlc_proto *next; /* next protocol in the list */

};
@@ -51,7 +51,7 @@ typedef struct hdlc_device { 
		      unsigned short encoding, unsigned short parity);



	/* hardware driver must handle this instead of dev->hard_start_xmit */

	int (*xmit)(struct sk_buff *skb, struct net_device *dev);

	netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev);



	/* Things below are for HDLC layer internal use only */

	const struct hdlc_proto *proto;
@@ -106,7 +106,7 @@ void hdlc_close(struct net_device *dev); 
/* May be used by hardware driver */

int hdlc_change_mtu(struct net_device *dev, int new_mtu);

/* Must be pointed to by hw driver's dev->netdev_ops->ndo_start_xmit */

int hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);

netdev_tx_t hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev);



int attach_hdlc_protocol(struct net_device *dev, struct hdlc_proto *proto,

			 size_t size);