Commit 3e1853e4 authored by Yunjian Wang's avatar Yunjian Wang Committed by David S. Miller
Browse files

net: emac: Fix use correct return type for ndo_start_xmit() 



The method ndo_start_xmit() returns a value of type netdev_tx_t. Fix
the ndo function to use the correct type.

Signed-off-by: default avatarYunjian Wang <wangyunjian@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58618ef8

drivers/net/ethernet/qualcomm/emac/emac-mac.c

+3 −2
Original line number Diff line number Diff line
@@ -1431,7 +1431,8 @@ error: 
}



/* Transmit the packet using specified transmit queue */

int emac_mac_tx_buf_send(struct emac_adapter *adpt, struct emac_tx_queue *tx_q,

netdev_tx_t emac_mac_tx_buf_send(struct emac_adapter *adpt,

				 struct emac_tx_queue *tx_q,

				 struct sk_buff *skb)

{

	struct emac_tpd tpd;

drivers/net/ethernet/qualcomm/emac/emac-mac.h

+3 −2
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ void emac_mac_stop(struct emac_adapter *adpt); 
void emac_mac_mode_config(struct emac_adapter *adpt);

void emac_mac_rx_process(struct emac_adapter *adpt, struct emac_rx_queue *rx_q,

			 int *num_pkts, int max_pkts);

int emac_mac_tx_buf_send(struct emac_adapter *adpt, struct emac_tx_queue *tx_q,

netdev_tx_t emac_mac_tx_buf_send(struct emac_adapter *adpt,

				 struct emac_tx_queue *tx_q,

				 struct sk_buff *skb);

void emac_mac_tx_process(struct emac_adapter *adpt, struct emac_tx_queue *tx_q);

void emac_mac_rx_tx_ring_init_all(struct platform_device *pdev,

drivers/net/ethernet/qualcomm/emac/emac.c

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ static int emac_napi_rtx(struct napi_struct *napi, int budget) 
}



/* Transmit the packet */

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

static netdev_tx_t emac_start_xmit(struct sk_buff *skb,

				   struct net_device *netdev)

{

	struct emac_adapter *adpt = netdev_priv(netdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE