aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-06 21:19:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-06 21:19:14 +0000
commit0ff3c396d39e762cb0230eb84b9bd1d29dddc520 (patch)
tree25a23535641b48d2b83e90e007c977404cade1b7 /target/linux/generic/patches-3.3/722-phy_mvswitch.patch
parentc3f0b757a3bd952f8d85753cd975618a3008ab36 (diff)
downloadupstream-0ff3c396d39e762cb0230eb84b9bd1d29dddc520.tar.gz
upstream-0ff3c396d39e762cb0230eb84b9bd1d29dddc520.tar.bz2
upstream-0ff3c396d39e762cb0230eb84b9bd1d29dddc520.zip
kernel: rewrite the phy packet hook, put it in the network stack to avoid having to keep non-upstream ethernet driver changes
SVN-Revision: 31637
Diffstat (limited to 'target/linux/generic/patches-3.3/722-phy_mvswitch.patch')
-rw-r--r--target/linux/generic/patches-3.3/722-phy_mvswitch.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/patches-3.3/722-phy_mvswitch.patch b/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
index 8b5bac2b1f..8a456117fa 100644
--- a/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
+++ b/target/linux/generic/patches-3.3/722-phy_mvswitch.patch
@@ -1,11 +1,12 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -113,6 +113,9 @@ config ADM6996_PHY
+@@ -113,6 +113,10 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
++ select ETHERNET_PACKET_MANGLE
+
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"