aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.4/7226-dpaa_eth-fix-adjust_link-for-10G-2.5G.patch
blob: f5a2ed73cc8c10748e99e8dd7fd4929754d190d1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
From 09a3bd3bb7e59703bfa5fa580436b4a85b15cfb0 Mon Sep 17 00:00:00 2001
From: Shaohui Xie <Shaohui.Xie@nxp.com>
Date: Fri, 22 Apr 2016 11:26:14 +0800
Subject: [PATCH] dpaa_eth: fix adjust_link for 10G & 2.5G

We don't support adjust link for 10G & 2.5G.

Signed-off-by: Shaohui Xie <Shaohui.Xie@nxp.com>
---
 drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
+++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
@@ -409,6 +409,10 @@ void get_pause_cfg(struct mac_device *ma
 }
 EXPORT_SYMBOL(get_pause_cfg);
 
+static void adjust_link_void(struct net_device *net_dev)
+{
+}
+
 static void adjust_link(struct net_device *net_dev)
 {
 	struct dpa_priv_s *priv = netdev_priv(net_dev);
@@ -473,7 +477,7 @@ static int xgmac_init_phy(struct net_dev
 				     mac_dev->phy_if);
 	else
 		phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
-					 &adjust_link, 0, mac_dev->phy_if);
+					 &adjust_link_void, 0, mac_dev->phy_if);
 	if (unlikely(phy_dev == NULL) || IS_ERR(phy_dev)) {
 		netdev_err(net_dev, "Could not attach to PHY %s\n",
 				mac_dev->phy_node ?
@@ -506,7 +510,7 @@ static int memac_init_phy(struct net_dev
 			return 0;
 		} else
 			phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
-						 &adjust_link, 0,
+						 &adjust_link_void, 0,
 						 mac_dev->phy_if);
 	} else {
 		if (!mac_dev->phy_node)