1 files changed, 0 insertions, 82 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0013-amd-xgbe-Merged-From-453f85d43fa9ee243f0fc3ac4e1be45.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0013-amd-xgbe-Merged-From-453f85d43fa9ee243f0fc3ac4e1be45.patch
deleted file mode 100644
index 20e88321..00000000
--- a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71-e3000/0013-amd-xgbe-Merged-From-453f85d43fa9ee243f0fc3ac4e1be45.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From accb928c3c5a8370a99cf5808d9db38e8fb604c5 Mon Sep 17 00:00:00 2001
-From: Sudheesh Mavila <sudheesh.mavila@amd.com>
-Date: Thu, 26 Jul 2018 22:36:39 +0530
-Subject: [PATCH 13/95] amd-xgbe: Merged From
- 453f85d43fa9ee243f0fc3ac4e1be45615301e3f and From
- c6c52ba1514120db3ad2d36391ed37bafcfc43d7
-
-Signed-off-by: Sudheesh Mavila <sudheesh.mavila@amd.com>
----
- drivers/net/ethernet/amd/xgbe/xgbe-desc.c |  2 +-
- drivers/net/ethernet/amd/xgbe/xgbe-drv.c  | 14 ++++++--------
- 2 files changed, 7 insertions(+), 9 deletions(-)
- mode change 100644 => 100755 drivers/net/ethernet/amd/xgbe/xgbe-desc.c
- mode change 100644 => 100755 drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-
-diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
-old mode 100644
-new mode 100755
-index 45d9230..cc1e4f8
---- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
-+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
-@@ -295,7 +295,7 @@ static int xgbe_alloc_pages(struct xgbe_prv_data *pdata,
- 	order = alloc_order;
- 
- 	/* Try to obtain pages, decreasing order if necessary */
--	gfp = GFP_ATOMIC | __GFP_COLD | __GFP_COMP | __GFP_NOWARN;
-+	gfp = GFP_ATOMIC | __GFP_COMP | __GFP_NOWARN;
- 	while (order >= 0) {
- 		pages = alloc_pages_node(node, gfp, order);
- 		if (pages)
-diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-old mode 100644
-new mode 100755
-index 145b5c0..8cfba4b
---- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-@@ -642,9 +642,9 @@ static irqreturn_t xgbe_dma_isr(int irq, void *data)
- 	return IRQ_HANDLED;
- }
- 
--static void xgbe_tx_timer(unsigned long data)
-+static void xgbe_tx_timer(struct timer_list *t)
- {
--	struct xgbe_channel *channel = (struct xgbe_channel *)data;
-+	struct xgbe_channel *channel = from_timer(channel, t, tx_timer);
- 	struct xgbe_prv_data *pdata = channel->pdata;
- 	struct napi_struct *napi;
- 
-@@ -680,9 +680,9 @@ static void xgbe_service(struct work_struct *work)
- 	pdata->phy_if.phy_status(pdata);
- }
- 
--static void xgbe_service_timer(unsigned long data)
-+static void xgbe_service_timer(struct timer_list *t)
- {
--	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;
-+	struct xgbe_prv_data *pdata = from_timer(pdata, t, service_timer);
- 
- 	queue_work(pdata->dev_workqueue, &pdata->service_work);
- 
-@@ -694,16 +694,14 @@ static void xgbe_init_timers(struct xgbe_prv_data *pdata)
- 	struct xgbe_channel *channel;
- 	unsigned int i;
- 
--	setup_timer(&pdata->service_timer, xgbe_service_timer,
--		    (unsigned long)pdata);
-+	timer_setup(&pdata->service_timer, xgbe_service_timer, 0);
- 
- 	for (i = 0; i < pdata->channel_count; i++) {
- 		channel = pdata->channel[i];
- 		if (!channel->tx_ring)
- 			break;
- 
--		setup_timer(&channel->tx_timer, xgbe_tx_timer,
--			    (unsigned long)channel);
-+		timer_setup(&channel->tx_timer, xgbe_tx_timer, 0);
- 	}
- }
- 
--- 
-2.7.4
-