239dff6697
The lantiq patch 0028-NET-lantiq-various-etop-fixes.patch and sunxi
patch 0051-stmmac-form-4-11.patch no longer applied after applying the
the "generalize napi_complete_done()" patch.
Update them so they apply, and refresh patches while at it.
Fixes: 9aeb7ce8dc ("generic: net: generalize napi_complete_done")
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
|
|
@@ -3152,10 +3152,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);
|
|
}
|
|
|