Commit ac1172de authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

net: cavium: fix return type of ndo_start_xmit function 



The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, so make sure the implementation in
this driver has returns 'netdev_tx_t' value, and change the function
return type to netdev_tx_t.

Found by coccinelle.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9c39411

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2313,7 +2313,7 @@ static inline int send_nic_timestamp_pkt(struct octeon_device *oct, 
 * @returns whether the packet was transmitted to the device okay or not

 *             (NETDEV_TX_OK or NETDEV_TX_BUSY)

 */

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

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

{

	struct lio *lio;

	struct octnet_buf_free_info *finfo;

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ static int send_nic_timestamp_pkt(struct octeon_device *oct, 
 * @returns whether the packet was transmitted to the device okay or not

 *             (NETDEV_TX_OK or NETDEV_TX_BUSY)

 */

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

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

{

	struct octnet_buf_free_info *finfo;

	union octnic_cmd_setup cmdsetup;

drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c

+3 −2
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 


static int lio_vf_rep_open(struct net_device *ndev);

static int lio_vf_rep_stop(struct net_device *ndev);

static int lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev);

static netdev_tx_t lio_vf_rep_pkt_xmit(struct sk_buff *skb,

				       struct net_device *ndev);

static void lio_vf_rep_tx_timeout(struct net_device *netdev);

static int lio_vf_rep_phys_port_name(struct net_device *dev,

				     char *buf, size_t len);
@@ -361,7 +362,7 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct, 
		netif_wake_queue(ndev);

}



static int

static netdev_tx_t

lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev)

{

	struct lio_vf_rep_desc *vf_rep = netdev_priv(ndev);

drivers/net/ethernet/cavium/octeon/octeon_mgmt.c

+3 −2
Original line number Diff line number Diff line
@@ -1268,12 +1268,13 @@ static int octeon_mgmt_stop(struct net_device *netdev) 
	return 0;

}



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

static netdev_tx_t

octeon_mgmt_xmit(struct sk_buff *skb, struct net_device *netdev)

{

	struct octeon_mgmt *p = netdev_priv(netdev);

	union mgmt_port_ring_entry re;

	unsigned long flags;

	int rv = NETDEV_TX_BUSY;

	netdev_tx_t rv = NETDEV_TX_BUSY;



	re.d64 = 0;

	re.s.tstamp = ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) != 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE