upgrade 3.13 targets to 3.13.7

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

diff --git a/target/linux/generic/patches-3.13/721-phy_packets.patch b/target/linux/generic/patches-3.13/721-phy_packets.patch
index 7b4902f20e85deb725f1cc890f676822ffa08f52..b6344f431b07f9fdf593dfd16ca551f0dbbc63cd 100644 (file)
--- a/target/linux/generic/patches-3.13/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.13/721-phy_packets.patch
@@ -79,7 +79,7 @@
        help
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -2604,10 +2604,20 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2606,10 +2606,20 @@ int dev_hard_start_xmit(struct sk_buff *
                if (!list_empty(&ptype_all))
                        dev_queue_xmit_nit(skb, dev);
  
@@ -105,7 +105,7 @@
                return rc;
 --- 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>
@@ -113,7 +113,7 @@
  
  #include <net/protocol.h>
  #include <net/dst.h>
-@@ -466,6 +467,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -438,6 +439,22 @@ struct sk_buff *__netdev_alloc_skb(struc
  }
  EXPORT_SYMBOL(__netdev_alloc_skb);