diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2016-08-16 17:40:32 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2016-08-16 22:42:00 +0200 |
commit | 13e20e6956320bd642314a4e364d5eea584a5849 (patch) | |
tree | ebca08563633bc3764cb3fa8f7c24d18a4785853 /target/linux/generic/patches-4.4/074-0003-net-bgmac-Remove-superflous-netif_carrier_on.patch | |
parent | 99a188828713d6ff9c541590b08d4e63ef52f6d7 (diff) | |
download | upstream-13e20e6956320bd642314a4e364d5eea584a5849.tar.gz upstream-13e20e6956320bd642314a4e364d5eea584a5849.tar.bz2 upstream-13e20e6956320bd642314a4e364d5eea584a5849.zip |
kernel: update bgmac by adding Florian's upstream changes
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/074-0003-net-bgmac-Remove-superflous-netif_carrier_on.patch')
-rw-r--r-- | target/linux/generic/patches-4.4/074-0003-net-bgmac-Remove-superflous-netif_carrier_on.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/074-0003-net-bgmac-Remove-superflous-netif_carrier_on.patch b/target/linux/generic/patches-4.4/074-0003-net-bgmac-Remove-superflous-netif_carrier_on.patch new file mode 100644 index 0000000000..edb027c504 --- /dev/null +++ b/target/linux/generic/patches-4.4/074-0003-net-bgmac-Remove-superflous-netif_carrier_on.patch @@ -0,0 +1,28 @@ +From 3894396e64994f31c3ef5c7e6f63dded0593e567 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli <f.fainelli@gmail.com> +Date: Thu, 23 Jun 2016 14:25:33 -0700 +Subject: [PATCH 3/3] net: bgmac: Remove superflous netif_carrier_on() + +bgmac_open() calls phy_start() to initialize the PHY state machine, +which will set the interface's carrier state accordingly, no need to +force that as this could be conflicting with the PHY state determined by +PHYLIB. + +Fixes: dd4544f05469 ("bgmac: driver for GBit MAC core on BCMA bus") +Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/ethernet/broadcom/bgmac.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -1323,8 +1323,6 @@ static int bgmac_open(struct net_device + + phy_start(net_dev->phydev); + +- netif_carrier_on(net_dev); +- + netif_start_queue(net_dev); + + return 0; |