1d2590f838
Refresh patches Fixes: CVE-2017-5754 aka Meltdown Tested-on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com> [fix conflict after 4.14 bump] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
28 lines
870 B
Diff
28 lines
870 B
Diff
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Date: Thu, 1 Oct 2015 00:34:08 +0100
|
|
Subject: [PATCH] net: mvneta: enable flow control for PHY connections
|
|
|
|
Enable flow control support for PHY connections by indicating our
|
|
support via the ethtool capabilities. phylink takes care of the
|
|
appropriate handling.
|
|
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/marvell/mvneta.c
|
|
+++ b/drivers/net/ethernet/marvell/mvneta.c
|
|
@@ -3153,10 +3153,11 @@ static void mvneta_validate_support(stru
|
|
phylink_set(mask, 10baseT_Full);
|
|
phylink_set(mask, 100baseT_Half);
|
|
phylink_set(mask, 100baseT_Full);
|
|
- } else {
|
|
- phylink_set(mask, Pause);
|
|
}
|
|
|
|
+ if (mode != MLO_AN_FIXED)
|
|
+ phylink_set(mask, Pause);
|
|
+
|
|
bitmap_and(support, support, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);
|
|
}
|
|
|