kernel: refresh 3.12 patches on -rc7 release

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

diff --git a/target/linux/generic/patches-3.12/721-phy_packets.patch b/target/linux/generic/patches-3.12/721-phy_packets.patch
index 8002bdf..9a1c011 100644 (file)
--- a/target/linux/generic/patches-3.12/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.12/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

-@@ -2601,9 +2601,19 @@ int dev_hard_start_xmit(struct sk_buff *
+@@ -2602,9 +2602,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;

-@@ -2619,9 +2629,19 @@ gso:
+@@ -2620,9 +2630,19 @@ gso:

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