Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

tulip: 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 3a27c149

drivers/net/tulip/de2104x.c

+2 −1
Original line number Diff line number Diff line
@@ -599,7 +599,8 @@ static void de_tx (struct de_private *de) 
		netif_wake_queue(de->dev);

}



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

static netdev_tx_t de_start_xmit (struct sk_buff *skb,

					struct net_device *dev)

{

	struct de_private *de = netdev_priv(dev);

	unsigned int entry, tx_free;

drivers/net/tulip/de4x5.c

+5 −6
Original line number Diff line number Diff line
@@ -895,7 +895,8 @@ static struct { 
** Public Functions

*/

static int     de4x5_open(struct net_device *dev);

static int     de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t de4x5_queue_pkt(struct sk_buff *skb,

					 struct net_device *dev);

static irqreturn_t de4x5_interrupt(int irq, void *dev_id);

static int     de4x5_close(struct net_device *dev);

static struct  net_device_stats *de4x5_get_stats(struct net_device *dev);
@@ -1456,18 +1457,16 @@ de4x5_sw_reset(struct net_device *dev) 
/*

** Writes a socket buffer address to the next available transmit descriptor.

*/

static int

static netdev_tx_t

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

{

    struct de4x5_private *lp = netdev_priv(dev);

    u_long iobase = dev->base_addr;

    int status = NETDEV_TX_OK;

    u_long flags = 0;



    netif_stop_queue(dev);

    if (!lp->tx_enable) {                   /* Cannot send for now */

    if (!lp->tx_enable)                   /* Cannot send for now */

	return NETDEV_TX_LOCKED;

    }



    /*

    ** Clean out the TX ring asynchronously to interrupts - sometimes the
@@ -1521,7 +1520,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev) 


    lp->cache.lock = 0;



    return status;

    return NETDEV_TX_OK;

}



/*

drivers/net/tulip/dmfe.c

+3 −2
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static u8 SF_mode; /* Special Function: 1:VLAN, 2:RX Flow Control 


/* function declaration ------------------------------------- */

static int dmfe_open(struct DEVICE *);

static int dmfe_start_xmit(struct sk_buff *, struct DEVICE *);

static netdev_tx_t dmfe_start_xmit(struct sk_buff *, struct DEVICE *);

static int dmfe_stop(struct DEVICE *);

static void dmfe_set_filter_mode(struct DEVICE *);

static const struct ethtool_ops netdev_ethtool_ops;
@@ -661,7 +661,8 @@ static void dmfe_init_dm910x(struct DEVICE *dev) 
 *	Send a packet to media from the upper layer.

 */



static int dmfe_start_xmit(struct sk_buff *skb, struct DEVICE *dev)

static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,

					 struct DEVICE *dev)

{

	struct dmfe_board_info *db = netdev_priv(dev);

	struct tx_desc *txptr;

drivers/net/tulip/tulip_core.c

+3 −2
Original line number Diff line number Diff line
@@ -256,7 +256,8 @@ const char tulip_media_cap[32] = 
static void tulip_tx_timeout(struct net_device *dev);

static void tulip_init_ring(struct net_device *dev);

static void tulip_free_ring(struct net_device *dev);

static int tulip_start_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t tulip_start_xmit(struct sk_buff *skb,

					  struct net_device *dev);

static int tulip_open(struct net_device *dev);

static int tulip_close(struct net_device *dev);

static void tulip_up(struct net_device *dev);
@@ -645,7 +646,7 @@ static void tulip_init_ring(struct net_device *dev) 
	tp->tx_ring[i-1].buffer2 = cpu_to_le32(tp->tx_ring_dma);

}



static int

static netdev_tx_t

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

{

	struct tulip_private *tp = netdev_priv(dev);

drivers/net/tulip/uli526x.c

+4 −2
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ static int mode = 8; 


/* function declaration ------------------------------------- */

static int uli526x_open(struct net_device *);

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

static netdev_tx_t uli526x_start_xmit(struct sk_buff *,

					    struct net_device *);

static int uli526x_stop(struct net_device *);

static void uli526x_set_filter_mode(struct net_device *);

static const struct ethtool_ops netdev_ethtool_ops;
@@ -567,7 +568,8 @@ static void uli526x_init(struct net_device *dev) 
 *	Send a packet to media from the upper layer.

 */



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

static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,

					    struct net_device *dev)

{

	struct uli526x_board_info *db = netdev_priv(dev);

	struct tx_desc *txptr;