aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-06 22:33:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-06 22:33:30 +0000
commit7c026d2bec67a8e23011371ef9f8e087720c9fc0 (patch)
tree457427043aec5862d6d6a1c314e1f7b5a5f2ae85
parent9819491d2335fb407882960bc3466a8e42ca84e8 (diff)
downloadupstream-7c026d2bec67a8e23011371ef9f8e087720c9fc0.tar.gz
upstream-7c026d2bec67a8e23011371ef9f8e087720c9fc0.tar.bz2
upstream-7c026d2bec67a8e23011371ef9f8e087720c9fc0.zip
[ar7] let 802.1q tagged frames go in and out from cpmac (#6730)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20023 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar7/patches-2.6.30/950-cpmac_allow_vlan.patch11
-rw-r--r--target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch11
2 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/ar7/patches-2.6.30/950-cpmac_allow_vlan.patch b/target/linux/ar7/patches-2.6.30/950-cpmac_allow_vlan.patch
new file mode 100644
index 0000000000..022da4fab5
--- /dev/null
+++ b/target/linux/ar7/patches-2.6.30/950-cpmac_allow_vlan.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/cpmac.c 2010-02-11 23:52:19.000000000 +0000
++++ b/drivers/net/cpmac.c 2010-02-20 20:32:58.000000000 +0000
+@@ -57,7 +57,7 @@
+
+ #define CPMAC_VERSION "0.5.0"
+ /* frame size + 802.1q tag */
+-#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + 4)
++#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + 4)
+ #define CPMAC_QUEUES 8
+
+ /* Ethernet registers */
diff --git a/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch b/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch
new file mode 100644
index 0000000000..022da4fab5
--- /dev/null
+++ b/target/linux/ar7/patches-2.6.32/960-cpmac_allow_vlan.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/cpmac.c 2010-02-11 23:52:19.000000000 +0000
++++ b/drivers/net/cpmac.c 2010-02-20 20:32:58.000000000 +0000
+@@ -57,7 +57,7 @@
+
+ #define CPMAC_VERSION "0.5.0"
+ /* frame size + 802.1q tag */
+-#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + 4)
++#define CPMAC_SKB_SIZE (ETH_FRAME_LEN + ETH_FCS_LEN + 4)
+ #define CPMAC_QUEUES 8
+
+ /* Ethernet registers */