ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-03 17:50:49 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

kernel: update 3.14 to 3.14.9

Browse Source 
Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 41362
This commit is contained in:
Luka Perkov 2014-06-27 21:10:02 +00:00
parent 4fe76889c0
commit abc694b463
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -23,8 +23,8 @@ endif
ifeq ($(LINUX_VERSION),3.13.7) ifeq ($(LINUX_VERSION),3.13.7)
LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
endif endif
ifeq ($(LINUX_VERSION),3.14.8) ifeq ($(LINUX_VERSION),3.14.9)
LINUX_KERNEL_MD5SUM:=d19dcd4819f2148cc85b80190133755e LINUX_KERNEL_MD5SUM:=62b80f9ab490db3bfe0b308a0d3f6f1f
endif endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions

8
target/linux/generic/patches-3.14/120-bridge_allow_receiption_on_disabled_port.patch
View File

@ -23,11 +23,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+ if (p->state != BR_STATE_DISABLED) { + if (p->state != BR_STATE_DISABLED) {
+ u16 vid = 0; + u16 vid = 0;
- br_vlan_get_tag(skb, &vid); - /* check if vlan is allowed, to avoid spoofing */
- if (p->flags & BR_LEARNING) - if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid))
- br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); - br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
+ br_vlan_get_tag(skb, &vid); + /* check if vlan is allowed, to avoid spoofing */
+ if (p->flags & BR_LEARNING) + if (p->flags & BR_LEARNING && br_should_learn(p, skb, &vid))
+ br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false); + br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
+ } + }
return 0; /* process further */ return 0; /* process further */

2
target/linux/generic/patches-3.14/644-bridge_optimize_netfilter_hooks.patch
View File

@ -96,7 +96,7 @@
if (vlan_tx_tag_present(skb)) if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h --- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h +++ b/net/bridge/br_private.h
@@ -717,15 +717,29 @@ static inline u16 br_get_pvid(const stru @@ -724,15 +724,29 @@ static inline u16 br_get_pvid(const stru
/* br_netfilter.c */ /* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER

2
target/linux/generic/patches-3.14/653-disable_netlink_trim.patch
View File

@ -1,6 +1,6 @@
--- a/net/netlink/af_netlink.c --- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c
@@ -1673,27 +1673,7 @@ void netlink_detachskb(struct sock *sk, @@ -1740,27 +1740,7 @@ void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{ {

34
target/linux/generic/patches-3.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View File

@ -80,7 +80,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -76,11 +78,9 @@ static bool log_ecn_error = true; @@ -77,11 +79,9 @@ static bool log_ecn_error = true;
module_param(log_ecn_error, bool, 0644); module_param(log_ecn_error, bool, 0644);
MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
@ -94,7 +94,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
} }
static int ip6_tnl_dev_init(struct net_device *dev); static int ip6_tnl_dev_init(struct net_device *dev);
@@ -179,15 +179,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store); @@ -180,15 +180,24 @@ EXPORT_SYMBOL_GPL(ip6_tnl_dst_store);
static struct ip6_tnl * static struct ip6_tnl *
ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local) ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_addr *local)
{ {
@ -123,7 +123,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
} }
t = rcu_dereference(ip6n->tnls_wc[0]); t = rcu_dereference(ip6n->tnls_wc[0]);
if (t && (t->dev->flags & IFF_UP)) if (t && (t->dev->flags & IFF_UP))
@@ -217,7 +226,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n, @@ -218,7 +227,7 @@ ip6_tnl_bucket(struct ip6_tnl_net *ip6n,
if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) { if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) {
prio = 1; prio = 1;
@ -132,7 +132,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
} }
return &ip6n->tnls[prio][h]; return &ip6n->tnls[prio][h];
} }
@@ -385,6 +394,12 @@ ip6_tnl_dev_uninit(struct net_device *de @@ -386,6 +395,12 @@ ip6_tnl_dev_uninit(struct net_device *de
struct net *net = t->net; struct net *net = t->net;
struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
@ -145,7 +145,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (dev == ip6n->fb_tnl_dev) if (dev == ip6n->fb_tnl_dev)
RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL); RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);
else else
@@ -768,6 +783,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t, @@ -769,6 +784,108 @@ int ip6_tnl_rcv_ctl(struct ip6_tnl *t,
} }
EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl); EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl);
@ -254,7 +254,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
/** /**
* ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally * ip6_tnl_rcv - decapsulate IPv6 packet and retransmit it locally
* @skb: received socket buffer * @skb: received socket buffer
@@ -812,6 +929,26 @@ static int ip6_tnl_rcv(struct sk_buff *s @@ -813,6 +930,26 @@ static int ip6_tnl_rcv(struct sk_buff *s
skb_reset_network_header(skb); skb_reset_network_header(skb);
skb->protocol = htons(protocol); skb->protocol = htons(protocol);
memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
@ -281,7 +281,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
__skb_tunnel_rx(skb, t->dev, t->net); __skb_tunnel_rx(skb, t->dev, t->net);
@@ -1072,6 +1209,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str @@ -1073,6 +1210,7 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
__u8 dsfield; __u8 dsfield;
__u32 mtu; __u32 mtu;
int err; int err;
@ -289,7 +289,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) || if ((t->parms.proto != IPPROTO_IPIP && t->parms.proto != 0) ||
!ip6_tnl_xmit_ctl(t)) !ip6_tnl_xmit_ctl(t))
@@ -1091,6 +1229,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str @@ -1092,6 +1230,18 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str
if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK) if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
fl6.flowi6_mark = skb->mark; fl6.flowi6_mark = skb->mark;
@ -308,7 +308,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu); err = ip6_tnl_xmit2(skb, dev, dsfield, &fl6, encap_limit, &mtu);
if (err != 0) { if (err != 0) {
/* XXX: send ICMP error even if DF is not set. */ /* XXX: send ICMP error even if DF is not set. */
@@ -1259,6 +1409,14 @@ ip6_tnl_change(struct ip6_tnl *t, const @@ -1260,6 +1410,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.flowinfo = p->flowinfo; t->parms.flowinfo = p->flowinfo;
t->parms.link = p->link; t->parms.link = p->link;
t->parms.proto = p->proto; t->parms.proto = p->proto;
@ -323,7 +323,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
ip6_tnl_dst_reset(t); ip6_tnl_dst_reset(t);
ip6_tnl_link_config(t); ip6_tnl_link_config(t);
return 0; return 0;
@@ -1289,6 +1447,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ @@ -1290,6 +1448,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
p->flowinfo = u->flowinfo; p->flowinfo = u->flowinfo;
p->link = u->link; p->link = u->link;
p->proto = u->proto; p->proto = u->proto;
@ -331,7 +331,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
memcpy(p->name, u->name, sizeof(u->name)); memcpy(p->name, u->name, sizeof(u->name));
} }
@@ -1576,6 +1735,15 @@ static int ip6_tnl_validate(struct nlatt @@ -1577,6 +1736,15 @@ static int ip6_tnl_validate(struct nlatt
return 0; return 0;
} }
@ -347,7 +347,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
static void ip6_tnl_netlink_parms(struct nlattr *data[], static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms) struct __ip6_tnl_parm *parms)
{ {
@@ -1609,6 +1777,46 @@ static void ip6_tnl_netlink_parms(struct @@ -1610,6 +1778,46 @@ static void ip6_tnl_netlink_parms(struct
if (data[IFLA_IPTUN_PROTO]) if (data[IFLA_IPTUN_PROTO])
parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]); parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
@ -394,7 +394,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
} }
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
@@ -1661,6 +1869,12 @@ static void ip6_tnl_dellink(struct net_d @@ -1662,6 +1870,12 @@ static void ip6_tnl_dellink(struct net_d
static size_t ip6_tnl_get_size(const struct net_device *dev) static size_t ip6_tnl_get_size(const struct net_device *dev)
{ {
@ -407,7 +407,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
return return
/* IFLA_IPTUN_LINK */ /* IFLA_IPTUN_LINK */
nla_total_size(4) + nla_total_size(4) +
@@ -1678,6 +1892,24 @@ static size_t ip6_tnl_get_size(const str @@ -1679,6 +1893,24 @@ static size_t ip6_tnl_get_size(const str
nla_total_size(4) + nla_total_size(4) +
/* IFLA_IPTUN_PROTO */ /* IFLA_IPTUN_PROTO */
nla_total_size(1) + nla_total_size(1) +
@ -432,7 +432,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
0; 0;
} }
@@ -1685,6 +1917,9 @@ static int ip6_tnl_fill_info(struct sk_b @@ -1686,6 +1918,9 @@ static int ip6_tnl_fill_info(struct sk_b
{ {
struct ip6_tnl *tunnel = netdev_priv(dev); struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms; struct __ip6_tnl_parm *parm = &tunnel->parms;
@ -442,7 +442,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr), nla_put(skb, IFLA_IPTUN_LOCAL, sizeof(struct in6_addr),
@@ -1695,8 +1930,27 @@ static int ip6_tnl_fill_info(struct sk_b @@ -1696,8 +1931,27 @@ static int ip6_tnl_fill_info(struct sk_b
nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) || nla_put_u8(skb, IFLA_IPTUN_ENCAP_LIMIT, parm->encap_limit) ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
@ -471,7 +471,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
return 0; return 0;
nla_put_failure: nla_put_failure:
@@ -1712,6 +1966,7 @@ static const struct nla_policy ip6_tnl_p @@ -1713,6 +1967,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 }, [IFLA_IPTUN_FLOWINFO] = { .type = NLA_U32 },
[IFLA_IPTUN_FLAGS] = { .type = NLA_U32 }, [IFLA_IPTUN_FLAGS] = { .type = NLA_U32 },
[IFLA_IPTUN_PROTO] = { .type = NLA_U8 }, [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },

2
target/linux/generic/patches-3.14/902-debloat_proc.patch
View File

@ -173,7 +173,7 @@
goto err; goto err;
--- a/net/core/sock.c --- a/net/core/sock.c
+++ b/net/core/sock.c +++ b/net/core/sock.c
@@ -2936,6 +2936,8 @@ static __net_initdata struct pernet_oper @@ -2985,6 +2985,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void) static int __init proto_init(void)
{ {

2
target/linux/x86_64/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=x86_64
FEATURES:=ext4 vdi vmdk targz FEATURES:=ext4 vdi vmdk targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
LINUX_VERSION:=3.14.8 LINUX_VERSION:=3.14.9
KERNELNAME:=bzImage KERNELNAME:=bzImage