kernel: update 3.10 to 3.10.34

[openwrt/openwrt.git] / target / linux / generic / patches-3.10 / 721-phy_packets.patch

diff --git a/target/linux/generic/patches-3.10/721-phy_packets.patch b/target/linux/generic/patches-3.10/721-phy_packets.patch
index e21e272183d8853744a68900a605a8cb1204256e..dcdd10283db4bd1e372afa49a57eb93b1aa670f2 100644 (file)
--- a/target/linux/generic/patches-3.10/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.10/721-phy_packets.patch
@@ -79,7 +79,7 @@
        help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
        help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c

-@@ -2576,9 +2576,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2581,9 +2581,19 @@ int dev_hard_start_xmit(struct sk_buff *

                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(skb, dev);
  
                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(skb, dev);
  


@@ -102,7 +102,7 @@
                if (rc == NETDEV_TX_OK)
                        txq_trans_update(txq);
                return rc;
                if (rc == NETDEV_TX_OK)
                        txq_trans_update(txq);
                return rc;

-@@ -2594,9 +2604,19 @@ gso:
+@@ -2599,9 +2609,19 @@ gso:

                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(nskb, dev);
  
                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(nskb, dev);
  


@@ -127,7 +127,7 @@
                                goto out_kfree_gso_skb;
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
                                goto out_kfree_gso_skb;
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c

-@@ -60,6 +60,7 @@
+@@ -62,6 +62,7 @@

  #include <linux/scatterlist.h>
  #include <linux/errqueue.h>
  #include <linux/prefetch.h>
  #include <linux/scatterlist.h>
  #include <linux/errqueue.h>
  #include <linux/prefetch.h>


@@ -135,7 +135,7 @@
  
  #include <net/protocol.h>
  #include <net/dst.h>
  
  #include <net/protocol.h>
  #include <net/dst.h>

-@@ -441,6 +442,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -443,6 +444,22 @@ struct sk_buff *__netdev_alloc_skb(struc

  }
  EXPORT_SYMBOL(__netdev_alloc_skb);
  
  }
  EXPORT_SYMBOL(__netdev_alloc_skb);