aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-07-13 22:45:56 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-07-13 22:45:56 +0000
commit8dfaf53e4db636d0cd2cc7e868fe8d132cf8b0c2 (patch)
tree60e1ec816d4d914cb975f46192a118fbb3a39c0a /target/linux
parent6390b285e91c43ff1406a6df6cdbf43ebdc33681 (diff)
downloadupstream-8dfaf53e4db636d0cd2cc7e868fe8d132cf8b0c2.tar.gz
upstream-8dfaf53e4db636d0cd2cc7e868fe8d132cf8b0c2.tar.bz2
upstream-8dfaf53e4db636d0cd2cc7e868fe8d132cf8b0c2.zip
kernel: refresh patches for kernel 3.8.13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37276 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch4
-rw-r--r--target/linux/generic/patches-3.8/204-module_strip.patch4
-rw-r--r--target/linux/generic/patches-3.8/531-debloat_lzma.patch39
-rw-r--r--target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch106
-rw-r--r--target/linux/generic/patches-3.8/902-debloat_proc.patch4
5 files changed, 69 insertions, 88 deletions
diff --git a/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch b/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch
index b00d813840..b54ce59e73 100644
--- a/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch
+++ b/target/linux/generic/patches-3.8/040-backport_led_gpio_request_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
-@@ -107,6 +107,10 @@ static int create_gpio_led(const struct
+@@ -107,6 +107,10 @@ static int create_gpio_led(const struct
return 0;
}
@@ -11,7 +11,7 @@
led_dat->cdev.name = template->name;
led_dat->cdev.default_trigger = template->default_trigger;
led_dat->gpio = template->gpio;
-@@ -126,10 +130,7 @@ static int create_gpio_led(const struct
+@@ -126,10 +130,7 @@ static int create_gpio_led(const struct
if (!template->retain_state_suspended)
led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
diff --git a/target/linux/generic/patches-3.8/204-module_strip.patch b/target/linux/generic/patches-3.8/204-module_strip.patch
index 28438bf659..df5c483ebc 100644
--- a/target/linux/generic/patches-3.8/204-module_strip.patch
+++ b/target/linux/generic/patches-3.8/204-module_strip.patch
@@ -78,7 +78,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#ifdef MODULE
#define __MODULE_INFO(tag, name, info) \
static const char __UNIQUE_ID(name)[] \
-@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
+@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[]
= __stringify(tag) "=" info
#else /* !MODULE */
/* This struct is here for syntactic coherency, it is not used */
@@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#endif
#define __MODULE_PARM_TYPE(name, _type) \
__MODULE_INFO(parmtype, name##type, #name ":" _type)
-@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
+@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[]
/* One for each parameter, describing how to use it. Some files do
multiple of these per line, so can't just use MODULE_INFO. */
#define MODULE_PARM_DESC(_parm, desc) \
diff --git a/target/linux/generic/patches-3.8/531-debloat_lzma.patch b/target/linux/generic/patches-3.8/531-debloat_lzma.patch
index 9f9690f187..aa3c498016 100644
--- a/target/linux/generic/patches-3.8/531-debloat_lzma.patch
+++ b/target/linux/generic/patches-3.8/531-debloat_lzma.patch
@@ -124,7 +124,7 @@
/* LzmaDecode
--- a/lib/lzma/LzmaDec.c
+++ b/lib/lzma/LzmaDec.c
-@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
+@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p,
p->needFlush = 0;
}
@@ -219,26 +219,26 @@
{
UInt32 dicSize;
Byte d;
-@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma
+@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
return SZ_OK;
}
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
--{
-- CLzmaProps propNew;
-- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
-- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
-- p->prop = propNew;
-- return SZ_OK;
--}
--
--SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
{
CLzmaProps propNew;
-- SizeT dicBufSize;
RINOK(LzmaProps_Decode(&propNew, props, propsSize));
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
+@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
+ p->prop = propNew;
+ return SZ_OK;
+ }
+-
+-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+-{
+- CLzmaProps propNew;
+- SizeT dicBufSize;
+- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
+- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
- dicBufSize = propNew.dicSize;
- if (p->dic == 0 || dicBufSize != p->dicBufSize)
- {
@@ -251,9 +251,12 @@
- }
- }
- p->dicBufSize = dicBufSize;
- p->prop = propNew;
- return SZ_OK;
- }
+- p->prop = propNew;
+- return SZ_OK;
+-}
+
+ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
+ const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
--- a/include/linux/lzma/LzmaEnc.h
+++ b/include/linux/lzma/LzmaEnc.h
@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps
@@ -597,7 +600,7 @@
void MatchFinder_Construct(CMatchFinder *p);
/* Conditions:
-@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
+@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p,
UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter,
ISzAlloc *alloc);
void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc);
@@ -686,7 +689,7 @@
{
memmove(p->bufferBase,
p->buffer - p->keepSizeBefore,
-@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
+@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder
p->buffer = p->bufferBase + p->keepSizeBefore;
}
diff --git a/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index f4d78533e6..942b6ca596 100644
--- a/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/patches-3.8/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -1,8 +1,6 @@
-Index: linux-3.8.13/include/net/netns/ipv6.h
-===================================================================
---- linux-3.8.13.orig/include/net/netns/ipv6.h 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/include/net/netns/ipv6.h 2013-06-10 14:14:20.898911309 +0200
-@@ -54,6 +54,7 @@
+--- a/include/net/netns/ipv6.h
++++ b/include/net/netns/ipv6.h
+@@ -54,6 +54,7 @@ struct netns_ipv6 {
unsigned long ip6_rt_last_gc;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
struct rt6_info *ip6_prohibit_entry;
@@ -10,11 +8,9 @@ Index: linux-3.8.13/include/net/netns/ipv6.h
struct rt6_info *ip6_blk_hole_entry;
struct fib6_table *fib6_local_tbl;
struct fib_rules_ops *fib6_rules_ops;
-Index: linux-3.8.13/include/uapi/linux/fib_rules.h
-===================================================================
---- linux-3.8.13.orig/include/uapi/linux/fib_rules.h 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/include/uapi/linux/fib_rules.h 2013-06-10 14:14:20.898911309 +0200
-@@ -64,6 +64,10 @@
+--- a/include/uapi/linux/fib_rules.h
++++ b/include/uapi/linux/fib_rules.h
+@@ -64,6 +64,10 @@ enum {
FR_ACT_BLACKHOLE, /* Drop without notification */
FR_ACT_UNREACHABLE, /* Drop with ENETUNREACH */
FR_ACT_PROHIBIT, /* Drop with EACCES */
@@ -25,11 +21,9 @@ Index: linux-3.8.13/include/uapi/linux/fib_rules.h
__FR_ACT_MAX,
};
-Index: linux-3.8.13/include/uapi/linux/icmpv6.h
-===================================================================
---- linux-3.8.13.orig/include/uapi/linux/icmpv6.h 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/include/uapi/linux/icmpv6.h 2013-06-10 14:14:20.898911309 +0200
-@@ -115,6 +115,7 @@
+--- a/include/uapi/linux/icmpv6.h
++++ b/include/uapi/linux/icmpv6.h
+@@ -115,6 +115,7 @@ struct icmp6hdr {
#define ICMPV6_NOT_NEIGHBOUR 2
#define ICMPV6_ADDR_UNREACH 3
#define ICMPV6_PORT_UNREACH 4
@@ -37,11 +31,9 @@ Index: linux-3.8.13/include/uapi/linux/icmpv6.h
/*
* Codes for Time Exceeded
-Index: linux-3.8.13/include/uapi/linux/rtnetlink.h
-===================================================================
---- linux-3.8.13.orig/include/uapi/linux/rtnetlink.h 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/include/uapi/linux/rtnetlink.h 2013-06-10 14:14:20.898911309 +0200
-@@ -203,6 +203,7 @@
+--- a/include/uapi/linux/rtnetlink.h
++++ b/include/uapi/linux/rtnetlink.h
+@@ -203,6 +203,7 @@ enum {
RTN_THROW, /* Not in this table */
RTN_NAT, /* Translate this address */
RTN_XRESOLVE, /* Use external resolver */
@@ -49,11 +41,9 @@ Index: linux-3.8.13/include/uapi/linux/rtnetlink.h
__RTN_MAX
};
-Index: linux-3.8.13/net/ipv4/fib_rules.c
-===================================================================
---- linux-3.8.13.orig/net/ipv4/fib_rules.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv4/fib_rules.c 2013-06-10 14:14:20.898911309 +0200
-@@ -84,6 +84,10 @@
+--- a/net/ipv4/fib_rules.c
++++ b/net/ipv4/fib_rules.c
+@@ -84,6 +84,10 @@ static int fib4_rule_action(struct fib_r
err = -EACCES;
goto errout;
@@ -64,11 +54,9 @@ Index: linux-3.8.13/net/ipv4/fib_rules.c
case FR_ACT_BLACKHOLE:
default:
err = -EINVAL;
-Index: linux-3.8.13/net/ipv4/fib_semantics.c
-===================================================================
---- linux-3.8.13.orig/net/ipv4/fib_semantics.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv4/fib_semantics.c 2013-06-10 14:14:20.898911309 +0200
-@@ -138,6 +138,10 @@
+--- a/net/ipv4/fib_semantics.c
++++ b/net/ipv4/fib_semantics.c
+@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX
.error = -EINVAL,
.scope = RT_SCOPE_NOWHERE,
},
@@ -79,11 +67,9 @@ Index: linux-3.8.13/net/ipv4/fib_semantics.c
};
static void rt_fibinfo_free(struct rtable __rcu **rtp)
-Index: linux-3.8.13/net/ipv4/fib_trie.c
-===================================================================
---- linux-3.8.13.orig/net/ipv4/fib_trie.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv4/fib_trie.c 2013-06-10 14:14:20.902911309 +0200
-@@ -2350,6 +2350,7 @@
+--- a/net/ipv4/fib_trie.c
++++ b/net/ipv4/fib_trie.c
+@@ -2350,6 +2350,7 @@ static const char *const rtn_type_names[
[RTN_THROW] = "THROW",
[RTN_NAT] = "NAT",
[RTN_XRESOLVE] = "XRESOLVE",
@@ -91,11 +77,9 @@ Index: linux-3.8.13/net/ipv4/fib_trie.c
};
static inline const char *rtn_type(char *buf, size_t len, unsigned int t)
-Index: linux-3.8.13/net/ipv4/ipmr.c
-===================================================================
---- linux-3.8.13.orig/net/ipv4/ipmr.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv4/ipmr.c 2013-06-10 14:14:20.902911309 +0200
-@@ -181,6 +181,7 @@
+--- a/net/ipv4/ipmr.c
++++ b/net/ipv4/ipmr.c
+@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_r
case FR_ACT_UNREACHABLE:
return -ENETUNREACH;
case FR_ACT_PROHIBIT:
@@ -103,11 +87,9 @@ Index: linux-3.8.13/net/ipv4/ipmr.c
return -EACCES;
case FR_ACT_BLACKHOLE:
default:
-Index: linux-3.8.13/net/ipv6/fib6_rules.c
-===================================================================
---- linux-3.8.13.orig/net/ipv6/fib6_rules.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv6/fib6_rules.c 2013-06-10 14:14:20.902911309 +0200
-@@ -69,6 +69,9 @@
+--- a/net/ipv6/fib6_rules.c
++++ b/net/ipv6/fib6_rules.c
+@@ -69,6 +69,9 @@ static int fib6_rule_action(struct fib_r
case FR_ACT_PROHIBIT:
rt = net->ipv6.ip6_prohibit_entry;
goto discard_pkt;
@@ -117,11 +99,9 @@ Index: linux-3.8.13/net/ipv6/fib6_rules.c
}
table = fib6_get_table(net, rule->table);
-Index: linux-3.8.13/net/ipv6/ip6mr.c
-===================================================================
---- linux-3.8.13.orig/net/ipv6/ip6mr.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv6/ip6mr.c 2013-06-10 14:14:20.902911309 +0200
-@@ -166,6 +166,8 @@
+--- a/net/ipv6/ip6mr.c
++++ b/net/ipv6/ip6mr.c
+@@ -166,6 +166,8 @@ static int ip6mr_rule_action(struct fib_
return -ENETUNREACH;
case FR_ACT_PROHIBIT:
return -EACCES;
@@ -130,11 +110,9 @@ Index: linux-3.8.13/net/ipv6/ip6mr.c
case FR_ACT_BLACKHOLE:
default:
return -EINVAL;
-Index: linux-3.8.13/net/ipv6/route.c
-===================================================================
---- linux-3.8.13.orig/net/ipv6/route.c 2013-06-10 14:14:20.910911309 +0200
-+++ linux-3.8.13/net/ipv6/route.c 2013-06-10 14:14:20.906911309 +0200
-@@ -258,6 +258,24 @@
+--- a/net/ipv6/route.c
++++ b/net/ipv6/route.c
+@@ -258,6 +258,24 @@ static const struct rt6_info ip6_prohibi
.rt6i_ref = ATOMIC_INIT(1),
};
@@ -159,7 +137,7 @@ Index: linux-3.8.13/net/ipv6/route.c
static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__refcnt = ATOMIC_INIT(1),
-@@ -1516,6 +1534,9 @@
+@@ -1516,6 +1534,9 @@ int ip6_route_add(struct fib6_config *cf
case RTN_THROW:
rt->dst.error = -EAGAIN;
break;
@@ -169,7 +147,7 @@ Index: linux-3.8.13/net/ipv6/route.c
default:
rt->dst.error = -ENETUNREACH;
break;
-@@ -2110,6 +2131,17 @@
+@@ -2110,6 +2131,17 @@ static int ip6_pkt_prohibit_out(struct s
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
@@ -187,7 +165,7 @@ Index: linux-3.8.13/net/ipv6/route.c
#endif
/*
-@@ -2321,7 +2353,8 @@
+@@ -2321,7 +2353,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
@@ -197,7 +175,7 @@ Index: linux-3.8.13/net/ipv6/route.c
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
-@@ -2524,6 +2557,9 @@
+@@ -2524,6 +2557,9 @@ static int rt6_fill_node(struct net *net
case -EACCES:
rtm->rtm_type = RTN_PROHIBIT;
break;
@@ -207,7 +185,7 @@ Index: linux-3.8.13/net/ipv6/route.c
case -EAGAIN:
rtm->rtm_type = RTN_THROW;
break;
-@@ -2775,6 +2811,8 @@
+@@ -2775,6 +2811,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -216,7 +194,7 @@ Index: linux-3.8.13/net/ipv6/route.c
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
-@@ -3037,6 +3075,17 @@
+@@ -3037,6 +3075,17 @@ static int __net_init ip6_route_net_init
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
@@ -234,7 +212,7 @@ Index: linux-3.8.13/net/ipv6/route.c
#endif
net->ipv6.sysctl.flush_delay = 0;
-@@ -3055,6 +3104,8 @@
+@@ -3055,6 +3104,8 @@ out:
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -243,7 +221,7 @@ Index: linux-3.8.13/net/ipv6/route.c
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
-@@ -3072,6 +3123,7 @@
+@@ -3072,6 +3123,7 @@ static void __net_exit ip6_route_net_exi
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
kfree(net->ipv6.ip6_blk_hole_entry);
@@ -251,7 +229,7 @@ Index: linux-3.8.13/net/ipv6/route.c
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
}
-@@ -3168,6 +3220,9 @@
+@@ -3168,6 +3220,9 @@ int __init ip6_route_init(void)
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
diff --git a/target/linux/generic/patches-3.8/902-debloat_proc.patch b/target/linux/generic/patches-3.8/902-debloat_proc.patch
index 4479e44998..3ac9914fa2 100644
--- a/target/linux/generic/patches-3.8/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch
@@ -227,7 +227,7 @@
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
-@@ -2607,10 +2607,12 @@ static const struct file_operations fib_
+@@ -2608,10 +2608,12 @@ static const struct file_operations fib_
int __net_init fib_proc_init(struct net *net)
{
@@ -242,7 +242,7 @@
&fib_triestat_fops))
goto out2;
-@@ -2629,8 +2631,10 @@ out1:
+@@ -2630,8 +2632,10 @@ out1:
void __net_exit fib_proc_exit(struct net *net)
{