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

wan: convert drivers to netdev_tx_t 



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

drivers/net/wan/cosa.c

+4 −3
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int cosa_net_attach(struct net_device *dev, unsigned short encoding, 
static int cosa_net_open(struct net_device *d);

static int cosa_net_close(struct net_device *d);

static void cosa_net_timeout(struct net_device *d);

static int cosa_net_tx(struct sk_buff *skb, struct net_device *d);

static netdev_tx_t cosa_net_tx(struct sk_buff *skb, struct net_device *d);

static char *cosa_net_setup_rx(struct channel_data *channel, int size);

static int cosa_net_rx_done(struct channel_data *channel);

static int cosa_net_tx_done(struct channel_data *channel, int size);
@@ -672,7 +672,8 @@ static int cosa_net_open(struct net_device *dev) 
	return 0;

}



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

static netdev_tx_t cosa_net_tx(struct sk_buff *skb,

				     struct net_device *dev)

{

	struct channel_data *chan = dev_to_chan(dev);
@@ -680,7 +681,7 @@ static int cosa_net_tx(struct sk_buff *skb, struct net_device *dev) 


	chan->tx_skb = skb;

	cosa_start_tx(chan, skb->data, skb->len);

	return 0;

	return NETDEV_TX_OK;

}



static void cosa_net_timeout(struct net_device *dev)

drivers/net/wan/cycx_x25.c

+4 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int cycx_netdevice_hard_header(struct sk_buff *skb, 
				      const void *daddr, const void *saddr,

				      unsigned len);

static int cycx_netdevice_rebuild_header(struct sk_buff *skb);

static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,

static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb,

							struct net_device *dev);



static struct net_device_stats *
@@ -593,7 +593,7 @@ static int cycx_netdevice_rebuild_header(struct sk_buff *skb) 
 *    bottom half" (with interrupts enabled).

 * 2. Setting tbusy flag will inhibit further transmit requests from the

 *    protocol stack and can be used for flow control with protocol layer. */

static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,

static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb,

							struct net_device *dev)

{

	struct cycx_x25_channel *chan = netdev_priv(dev);

drivers/net/wan/dlci.c

+7 −6
Original line number Diff line number Diff line
@@ -186,12 +186,11 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev) 
		dev_kfree_skb(skb);

}



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

static netdev_tx_t dlci_transmit(struct sk_buff *skb,

				       struct net_device *dev)

{

	struct dlci_local *dlp;

	int					ret;



	ret = 0;

	netdev_tx_t ret;



	if (!skb || !dev)

		return NETDEV_TX_OK;
@@ -200,6 +199,8 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev) 


	netif_stop_queue(dev);

	

	/* This is hackish, overloads driver specific return values

	   on top of normal transmit return! */

	ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);

	switch (ret)

	{

drivers/net/wan/dscc4.c

+4 −2
Original line number Diff line number Diff line
@@ -359,7 +359,8 @@ static void dscc4_tx_irq(struct dscc4_pci_priv *, struct dscc4_dev_priv *); 
static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr);

static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent);

static int dscc4_open(struct net_device *);

static int dscc4_start_xmit(struct sk_buff *, struct net_device *);

static netdev_tx_t dscc4_start_xmit(struct sk_buff *,

					  struct net_device *);

static int dscc4_close(struct net_device *);

static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

static int dscc4_init_ring(struct net_device *);
@@ -1148,7 +1149,8 @@ static int dscc4_tx_poll(struct dscc4_dev_priv *dpriv, struct net_device *dev) 
}

#endif /* DSCC4_POLLING */



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

static netdev_tx_t dscc4_start_xmit(struct sk_buff *skb,

					  struct net_device *dev)

{

	struct dscc4_dev_priv *dpriv = dscc4_priv(dev);

	struct dscc4_pci_priv *ppriv = dpriv->pci_priv;

drivers/net/wan/farsync.c

+1 −1
Original line number Diff line number Diff line
@@ -2274,7 +2274,7 @@ fst_tx_timeout(struct net_device *dev) 
	port->start = 0;

}



static int

static netdev_tx_t

fst_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct fst_card_info *card;