aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-02 15:34:34 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-02 15:34:34 +0200
commita105eac4dd424fafdea3a72c270ef9cf9cdc1433 (patch)
tree64d2b476c58e5a3be8fce7bf778910ee31003e70 /target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch
parent794383b801516896c352b94b99010c86e9a06b9c (diff)
downloadupstream-a105eac4dd424fafdea3a72c270ef9cf9cdc1433.tar.gz
upstream-a105eac4dd424fafdea3a72c270ef9cf9cdc1433.tar.bz2
upstream-a105eac4dd424fafdea3a72c270ef9cf9cdc1433.zip
kernel: update kernel 4.4 to version 4.4.12
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch')
-rw-r--r--target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch b/target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch
index 244eb67750..42adb9e786 100644
--- a/target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch
+++ b/target/linux/mediatek/patches-4.4/0078-net-next-mediatek-fix-gigabit-and-flow-control-adver.patch
@@ -14,11 +14,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 30 +++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
-diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index 0c8d369..3436c7b 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -133,6 +133,8 @@ static int mtk_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)
+@@ -133,6 +133,8 @@ static int mtk_mdio_read(struct mii_bus
static void mtk_phy_link_adjust(struct net_device *dev)
{
struct mtk_mac *mac = netdev_priv(dev);
@@ -27,7 +25,7 @@ index 0c8d369..3436c7b 100644
u32 mcr = MAC_MCR_MAX_RX_1536 | MAC_MCR_IPG_CFG |
MAC_MCR_FORCE_MODE | MAC_MCR_TX_EN |
MAC_MCR_RX_EN | MAC_MCR_BACKOFF_EN |
-@@ -150,11 +152,30 @@ static void mtk_phy_link_adjust(struct net_device *dev)
+@@ -150,11 +152,30 @@ static void mtk_phy_link_adjust(struct n
if (mac->phy_dev->link)
mcr |= MAC_MCR_FORCE_LINK;
@@ -61,7 +59,7 @@ index 0c8d369..3436c7b 100644
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
-@@ -236,7 +257,8 @@ static int mtk_phy_connect(struct mtk_mac *mac)
+@@ -236,7 +257,8 @@ static int mtk_phy_connect(struct mtk_ma
mac->phy_dev->autoneg = AUTONEG_ENABLE;
mac->phy_dev->speed = 0;
mac->phy_dev->duplex = 0;
@@ -71,6 +69,3 @@ index 0c8d369..3436c7b 100644
mac->phy_dev->advertising = mac->phy_dev->supported |
ADVERTISED_Autoneg;
phy_start_aneg(mac->phy_dev);
---
-1.7.10.4
-