diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-24 13:05:22 +0000 |
| commit | dcde44e37ed89b02bf98c89c9d20eb7097e21707 (patch) | |
| tree | b152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/620-sched_esfq.patch | |
| parent | 59d0f03c9af97f38ddb4b99d9a86fa845e1fe170 (diff) | |
| download | master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.gz master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.tar.bz2 master-187ad058-dcde44e37ed89b02bf98c89c9d20eb7097e21707.zip | |
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/620-sched_esfq.patch')
| -rw-r--r-- | target/linux/generic/patches-3.6/620-sched_esfq.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/620-sched_esfq.patch b/target/linux/generic/patches-3.6/620-sched_esfq.patch index 1fdf09d099..a21bf1e45d 100644 --- a/target/linux/generic/patches-3.6/620-sched_esfq.patch +++ b/target/linux/generic/patches-3.6/620-sched_esfq.patch @@ -1,6 +1,6 @@ --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h -@@ -193,6 +193,33 @@ struct tc_sfq_xstats { +@@ -214,6 +214,33 @@ struct tc_sfq_xstats { __s32 allot; }; @@ -114,7 +114,6 @@ + +#include <linux/module.h> +#include <asm/uaccess.h> -+#include <asm/system.h> +#include <linux/bitops.h> +#include <linux/types.h> +#include <linux/kernel.h> @@ -751,7 +750,8 @@ + opt.flows = q->depth; + opt.hash_kind = q->hash_kind; + -+ NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt); ++ if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt)) ++ goto nla_put_failure; + + return skb->len; + |