[backfire] merge CRLF changes from r21462

[openwrt-10.03/.git] / target / linux / brcm63xx / patches-2.6.32 / 070_bcm63xx_enet_vlan_incoming_fixed.patch

diff --git a/target/linux/brcm63xx/patches-2.6.32/070_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/brcm63xx/patches-2.6.32/070_bcm63xx_enet_vlan_incoming_fixed.patch
index 681f203fb7fabf586f89386e16c5017424a2b68f..e5e1dc4dfa2c5f1a37a2026d6e4a2ef499cba3b5 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.32/070_bcm63xx_enet_vlan_incoming_fixed.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/070_bcm63xx_enet_vlan_incoming_fixed.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.9/drivers/net/bcm63xx_enet.c
-===================================================================
---- linux-2.6.32.9.orig/drivers/net/bcm63xx_enet.c     2010-02-28 18:18:37.000000000 +0100
-+++ linux-2.6.32.9/drivers/net/bcm63xx_enet.c  2010-02-28 18:20:03.000000000 +0100
-@@ -1526,7 +1526,7 @@
+--- a/drivers/net/bcm63xx_enet.c
++++ b/drivers/net/bcm63xx_enet.c
+@@ -1526,7 +1526,7 @@ static int compute_hw_mtu(struct bcm_ene
        actual_mtu = mtu;
  
        /* add ethernet header + vlan tag size */