kernel: update 3.10 to 3.10.32

[openwrt.git] / target / linux / ramips / patches-3.10 / 999-raeth_fixes.patch

diff --git a/target/linux/ramips/patches-3.10/999-raeth_fixes.patch b/target/linux/ramips/patches-3.10/999-raeth_fixes.patch
index 6e6e81a..5e1bb4d 100644 (file)
--- a/target/linux/ramips/patches-3.10/999-raeth_fixes.patch
+++ b/target/linux/ramips/patches-3.10/999-raeth_fixes.patch
@@ -1,8 +1,6 @@
-Index: linux-3.10.24/drivers/net/ethernet/ralink/ralink_soc_eth.c
-===================================================================
---- linux-3.10.24.orig/drivers/net/ethernet/ralink/ralink_soc_eth.c    2013-12-27 20:32:59.004068866 +0100
-+++ linux-3.10.24/drivers/net/ethernet/ralink/ralink_soc_eth.c 2013-12-27 21:16:44.892046631 +0100
-@@ -335,7 +335,7 @@
+--- a/drivers/net/ethernet/ralink/ralink_soc_eth.c
++++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
+@@ -335,7 +335,7 @@ static int fe_start_xmit(struct sk_buff
        if (priv->soc->tso)
                fe_start_tso(skb, dev, nr_frags, tx);
  
@@ -11,3 +9,13 @@ Index: linux-3.10.24/drivers/net/ethernet/ralink/ralink_soc_eth.c
                struct iphdr *iph = NULL;
                struct tcphdr *th = NULL;
                struct ipv6hdr *ip6h = NULL;
+@@ -741,8 +741,7 @@ static int fe_probe(struct platform_devi
+               dev_info(&pdev->dev, "Enabling TSO\n");
+               netdev->features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_IPV6_CSUM;
+       }
+-
+-      netdev->hw_features = netdev->vlan_features = netdev->features;
++      netdev->hw_features = netdev->features;
+ 
+       netdev->irq = platform_get_irq(pdev, 0);
+       if (netdev->irq < 0) {