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
commitf20d1938b59d2edb85d5cd6b67176b452e9dff67 (patch)
tree044abda1179e26bc1161e60d5a06a7ff784c9bab /target/linux/generic/patches-3.3/722-phy_mvswitch.patch
parentc7667e1b888e04d3696dc01d7874ef484ba502f7 (diff)
downloadmaster-187ad058-f20d1938b59d2edb85d5cd6b67176b452e9dff67.tar.gz
master-187ad058-f20d1938b59d2edb85d5cd6b67176b452e9dff67.tar.bz2
master-187ad058-f20d1938b59d2edb85d5cd6b67176b452e9dff67.zip
kernel: rewrite the phy packet hook, put it in the network stack to avoid having to keep non-upstream ethernet driver changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31637 3c298f89-4303-0410-b956-a3cf2f4a3e73
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"