Commit d8a6472f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdev_tx_t' 



Luc Van Oostenryck says:

====================
net: always use netdev_tx_t for xmit()'s return type

The ndo_start_xmit() methods should return a 'netdev_tx_t', not
an int, and so should return NETDEV_TX_OK, not 0.
The patches in the series fix most of the remaning drivers and
subsystems (those included in allyesconfig on x86).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fe80536a 2a784784

drivers/net/caif/caif_hsi.c

+3 −3
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static void cfhsi_aggregation_tout(struct timer_list *t) 
	cfhsi_start_tx(cfhsi);

}



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

static netdev_tx_t cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct cfhsi *cfhsi = NULL;

	int start_xfer = 0;
@@ -1072,7 +1072,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) 
		spin_unlock_bh(&cfhsi->lock);

		if (aggregate_ready)

			cfhsi_start_tx(cfhsi);

		return 0;

		return NETDEV_TX_OK;

	}



	/* Delete inactivity timer if started. */
@@ -1102,7 +1102,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) 
			queue_work(cfhsi->wq, &cfhsi->wake_up_work);

	}



	return 0;

	return NETDEV_TX_OK;

}



static const struct net_device_ops cfhsi_netdevops;

drivers/net/caif/caif_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ error: 
	return tty_wr;

}



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

static netdev_tx_t caif_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct ser_device *ser;

drivers/net/caif/caif_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static void cfspi_xfer_done_cb(struct cfspi_ifc *ifc) 
	complete(&cfspi->comp);

}



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

static netdev_tx_t cfspi_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct cfspi *cfspi = NULL;

	unsigned long flags;
@@ -514,7 +514,7 @@ static int cfspi_xmit(struct sk_buff *skb, struct net_device *dev) 
		cfspi->cfdev.flowctrl(cfspi->ndev, 0);

	}



	return 0;

	return NETDEV_TX_OK;

}



int cfspi_rxfrm(struct cfspi *cfspi, u8 *buf, size_t len)

drivers/net/caif/caif_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ err: 
}



/* Put the CAIF packet on the virtio ring and kick the receiver */

static int cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev)

static netdev_tx_t cfv_netdev_tx(struct sk_buff *skb, struct net_device *netdev)

{

	struct cfv_info *cfv = netdev_priv(netdev);

	struct buf_info *buf_info;

drivers/net/ethernet/aquantia/atlantic/aq_main.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ err_exit: 
	return err;

}



static int aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev)

static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *ndev)

{

	struct aq_nic_s *aq_nic = netdev_priv(ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE