1 files changed, 0 insertions, 45 deletions
diff --git a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5743-net-amd-fix-return-type-of-ndo_start_xmit-function.patch b/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5743-net-amd-fix-return-type-of-ndo_start_xmit-function.patch
deleted file mode 100644
index 77dba6a6..00000000
--- a/meta-r1000/recipes-kernel/linux/linux-yocto-4.14.71/5743-net-amd-fix-return-type-of-ndo_start_xmit-function.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 56abff6d96f7b1f48e2f01b062d14613846275b7 Mon Sep 17 00:00:00 2001
-From: YueHaibing <yuehaibing@huawei.com>
-Date: Wed, 19 Sep 2018 18:50:17 +0800
-Subject: [PATCH 5743/5758] net: amd: 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>
-Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
----
- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-index 093e2fd..93b4048 100644
---- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-@@ -2009,7 +2009,7 @@ static int xgbe_close(struct net_device *netdev)
- 	return 0;
- }
- 
--static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
-+static netdev_tx_t xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
- {
- 	struct xgbe_prv_data *pdata = netdev_priv(netdev);
- 	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-@@ -2018,7 +2018,7 @@ static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
- 	struct xgbe_ring *ring;
- 	struct xgbe_packet_data *packet;
- 	struct netdev_queue *txq;
--	int ret;
-+	netdev_tx_t ret;
- 
- 	DBGPR("-->xgbe_xmit: skb->len = %d\n", skb->len);
- 
--- 
-2.7.4
-