Browse Source

net: faraday: 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: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
YueHaibing 6 years ago
parent
commit
0a71515665

+ 2 - 2
drivers/net/ethernet/faraday/ftgmac100.c

@@ -712,8 +712,8 @@ static bool ftgmac100_prep_tx_csum(struct sk_buff *skb, u32 *csum_vlan)
 	return skb_checksum_help(skb) == 0;
 	return skb_checksum_help(skb) == 0;
 }
 }
 
 
-static int ftgmac100_hard_start_xmit(struct sk_buff *skb,
-				     struct net_device *netdev)
+static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,
+					     struct net_device *netdev)
 {
 {
 	struct ftgmac100 *priv = netdev_priv(netdev);
 	struct ftgmac100 *priv = netdev_priv(netdev);
 	struct ftgmac100_txdes *txdes, *first;
 	struct ftgmac100_txdes *txdes, *first;

+ 4 - 3
drivers/net/ethernet/faraday/ftmac100.c

@@ -634,8 +634,8 @@ static void ftmac100_tx_complete(struct ftmac100 *priv)
 		;
 		;
 }
 }
 
 
-static int ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,
-			 dma_addr_t map)
+static netdev_tx_t ftmac100_xmit(struct ftmac100 *priv, struct sk_buff *skb,
+				 dma_addr_t map)
 {
 {
 	struct net_device *netdev = priv->netdev;
 	struct net_device *netdev = priv->netdev;
 	struct ftmac100_txdes *txdes;
 	struct ftmac100_txdes *txdes;
@@ -1016,7 +1016,8 @@ static int ftmac100_stop(struct net_device *netdev)
 	return 0;
 	return 0;
 }
 }
 
 
-static int ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t
+ftmac100_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 {
 {
 	struct ftmac100 *priv = netdev_priv(netdev);
 	struct ftmac100 *priv = netdev_priv(netdev);
 	dma_addr_t map;
 	dma_addr_t map;