[generic/3.3]: refresh patches

SVN-Revision: 33501

diff --git a/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch b/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch
index 210a58c6a7124e10d9d02d6cccd763acc8879ae2..2fc957570321d40f59e34056a37125da5a4e9d5b 100644 (file)
--- a/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch
+++ b/target/linux/generic/patches-3.3/049-codel-refine-one-condition-to-avoid-a-nul-rec_inv_sqrt.patch
@@ -39,11 +39,9 @@ To unsubscribe from this list: send the line "unsubscribe netdev" in
 the body of a message to majordomo@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 
 the body of a message to majordomo@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
 

-diff --git a/include/net/codel.h b/include/net/codel.h
-index 550debf..389cf62 100644

 --- a/include/net/codel.h
 +++ b/include/net/codel.h
 --- a/include/net/codel.h
 +++ b/include/net/codel.h

-@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -305,6 +305,8 @@ static struct sk_buff *codel_dequeue(str

                        }
                }
        } else if (drop) {
                        }
                }
        } else if (drop) {


@@ -52,7 +50,7 @@ index 550debf..389cf62 100644
                if (params->ecn && INET_ECN_set_ce(skb)) {
                        stats->ecn_mark++;
                } else {
                if (params->ecn && INET_ECN_set_ce(skb)) {
                        stats->ecn_mark++;
                } else {

-@@ -320,9 +322,11 @@ static struct sk_buff *codel_dequeue(struct Qdisc *sch,
+@@ -320,9 +322,11 @@ static struct sk_buff *codel_dequeue(str

                 * assume that the drop rate that controlled the queue on the
                 * last cycle is a good starting point to control it now.
                 */
                 * assume that the drop rate that controlled the queue on the
                 * last cycle is a good starting point to control it now.
                 */

diff --git a/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch b/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch
index b2172599b1314f2f1f7b972945f0b349f21e2f64..94acf3780393df84667b70e224f515a7c47d1c71 100644 (file)
--- a/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch
+++ b/target/linux/generic/patches-3.3/140-ixp4xx_hss_module_h_include.patch
@@ -27,8 +27,6 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  drivers/net/wan/ixp4xx_hss.c |    1 +
  1 file changed, 1 insertion(+)
 
  drivers/net/wan/ixp4xx_hss.c |    1 +
  1 file changed, 1 insertion(+)
 

-diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c
-index aaaca9a..3f575af 100644

 --- a/drivers/net/wan/ixp4xx_hss.c
 +++ b/drivers/net/wan/ixp4xx_hss.c
 @@ -10,6 +10,7 @@
 --- a/drivers/net/wan/ixp4xx_hss.c
 +++ b/drivers/net/wan/ixp4xx_hss.c
 @@ -10,6 +10,7 @@


@@ -39,6 +37,3 @@ index aaaca9a..3f575af 100644
  #include <linux/bitops.h>
  #include <linux/cdev.h>
  #include <linux/dma-mapping.h>
  #include <linux/bitops.h>
  #include <linux/cdev.h>
  #include <linux/dma-mapping.h>

--- 
-1.7.9.5
-