3.14 final is out
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 40352
This commit is contained in:
parent
a22190340a
commit
36fefbb60e
@ -26,6 +26,9 @@ endif
|
||||
ifeq ($(LINUX_VERSION),3.13.7)
|
||||
LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
|
||||
endif
|
||||
ifeq ($(LINUX_VERSION),3.14)
|
||||
LINUX_KERNEL_MD5SUM:=b621207b3f6ecbb67db18b13258f8ea8
|
||||
endif
|
||||
|
||||
# disable the md5sum check for unknown kernel versions
|
||||
LINUX_KERNEL_MD5SUM?=x
|
||||
|
@ -243,7 +243,7 @@
|
||||
will be called when part or all of the page is to be removed
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -6451,6 +6451,13 @@ F: drivers/scsi/osd/
|
||||
@@ -6452,6 +6452,13 @@ F: drivers/scsi/osd/
|
||||
F: include/scsi/osd_*
|
||||
F: fs/exofs/
|
||||
|
||||
@ -326,7 +326,7 @@
|
||||
|
||||
/**
|
||||
* sb_permission - Check superblock-level permissions
|
||||
@@ -3038,9 +3039,12 @@ finish_open_created:
|
||||
@@ -3035,9 +3036,12 @@ finish_open_created:
|
||||
error = may_open(&nd->path, acc_mode, open_flag);
|
||||
if (error)
|
||||
goto out;
|
||||
@ -344,7 +344,7 @@
|
||||
goto out;
|
||||
--- a/fs/namespace.c
|
||||
+++ b/fs/namespace.c
|
||||
@@ -1495,6 +1495,33 @@ void drop_collected_mounts(struct vfsmou
|
||||
@@ -1541,6 +1541,33 @@ void drop_collected_mounts(struct vfsmou
|
||||
namespace_unlock();
|
||||
}
|
||||
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -144,11 +144,13 @@ drop:
|
||||
@@ -145,11 +145,13 @@ drop:
|
||||
static int br_handle_local_finish(struct sk_buff *skb)
|
||||
{
|
||||
struct net_bridge_port *p = br_port_get_rcu(skb->dev);
|
||||
@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
|
||||
return 0; /* process further */
|
||||
}
|
||||
|
||||
@@ -218,6 +220,18 @@ rx_handler_result_t br_handle_frame(stru
|
||||
@@ -219,6 +221,18 @@ rx_handler_result_t br_handle_frame(stru
|
||||
|
||||
forward:
|
||||
switch (p->state) {
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -96,7 +96,11 @@ int br_handle_frame_finish(struct sk_buf
|
||||
@@ -97,7 +97,11 @@ int br_handle_frame_finish(struct sk_buf
|
||||
|
||||
dst = NULL;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -83,7 +83,7 @@ int br_handle_frame_finish(struct sk_buf
|
||||
@@ -84,7 +84,7 @@ int br_handle_frame_finish(struct sk_buf
|
||||
br_multicast_rcv(br, p, skb, vid))
|
||||
goto drop;
|
||||
|
||||
|
@ -43,7 +43,7 @@
|
||||
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -119,8 +119,8 @@ int br_handle_frame_finish(struct sk_buf
|
||||
@@ -120,8 +120,8 @@ int br_handle_frame_finish(struct sk_buf
|
||||
|
||||
unicast = false;
|
||||
br->dev->stats.multicast++;
|
||||
|
@ -32,7 +32,7 @@
|
||||
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
|
||||
--- a/net/ipv6/addrconf.c
|
||||
+++ b/net/ipv6/addrconf.c
|
||||
@@ -1307,7 +1307,7 @@ out:
|
||||
@@ -1311,7 +1311,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
const struct in6_addr *daddr, unsigned int prefs,
|
||||
struct in6_addr *saddr)
|
||||
{
|
||||
@@ -1432,7 +1432,6 @@ try_nextdev:
|
||||
@@ -1436,7 +1436,6 @@ try_nextdev:
|
||||
in6_ifa_put(hiscore->ifa);
|
||||
return 0;
|
||||
}
|
||||
@ -49,7 +49,7 @@
|
||||
|
||||
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
|
||||
u32 banned_flags)
|
||||
@@ -5297,6 +5296,9 @@ int __init addrconf_init(void)
|
||||
@@ -5385,6 +5384,9 @@ int __init addrconf_init(void)
|
||||
|
||||
ipv6_addr_label_rtnl_register();
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
return 0;
|
||||
errout:
|
||||
rtnl_af_unregister(&inet6_ops);
|
||||
@@ -5314,6 +5316,9 @@ void addrconf_cleanup(void)
|
||||
@@ -5404,6 +5406,9 @@ void addrconf_cleanup(void)
|
||||
struct net_device *dev;
|
||||
int i;
|
||||
|
||||
|
@ -29,16 +29,16 @@
|
||||
|
||||
--- a/net/bridge/br_input.c
|
||||
+++ b/net/bridge/br_input.c
|
||||
@@ -52,7 +52,7 @@ static int br_pass_frame_up(struct sk_bu
|
||||
indev = skb->dev;
|
||||
skb->dev = brdev;
|
||||
@@ -53,7 +53,7 @@ static int br_pass_frame_up(struct sk_bu
|
||||
if (!skb)
|
||||
return NET_RX_DROP;
|
||||
|
||||
- return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
|
||||
+ return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
|
||||
netif_receive_skb);
|
||||
}
|
||||
|
||||
@@ -213,7 +213,7 @@ rx_handler_result_t br_handle_frame(stru
|
||||
@@ -214,7 +214,7 @@ rx_handler_result_t br_handle_frame(stru
|
||||
}
|
||||
|
||||
/* Deliver packet to local host only */
|
||||
@ -47,7 +47,7 @@
|
||||
NULL, br_handle_local_finish)) {
|
||||
return RX_HANDLER_CONSUMED; /* consumed by filter */
|
||||
} else {
|
||||
@@ -228,7 +228,7 @@ forward:
|
||||
@@ -229,7 +229,7 @@ forward:
|
||||
if (ether_addr_equal(p->br->dev->dev_addr, dest))
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
br_handle_local_finish))
|
||||
break;
|
||||
|
||||
@@ -250,7 +250,7 @@ forward:
|
||||
@@ -251,7 +251,7 @@ forward:
|
||||
if (ether_addr_equal(p->br->dev->dev_addr, dest))
|
||||
skb->pkt_type = PACKET_HOST;
|
||||
|
||||
|
@ -79,7 +79,7 @@
|
||||
help
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -2602,10 +2602,20 @@ int dev_hard_start_xmit(struct sk_buff *
|
||||
@@ -2607,10 +2607,20 @@ int dev_hard_start_xmit(struct sk_buff *
|
||||
if (!list_empty(&ptype_all))
|
||||
dev_queue_xmit_nit(skb, dev);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user