diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
| commit | 5d4be21553ddc62ac97b9698c656829d7e814ee1 (patch) | |
| tree | 96d2c11b857e6ec2cd443a6bb5cc76239994c1f9 /target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch | |
| parent | 5abe49b74ed399880c9f16e0fac2e1a2b302f9d7 (diff) | |
| download | master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.gz master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.tar.bz2 master-187ad058-5d4be21553ddc62ac97b9698c656829d7e814ee1.zip | |
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0
targets might need a minor refresh as well, however, it looks
like everything still applies cleanly with occasional small
offsets.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch b/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch index 5c2dcf3472..b36bcd8167 100644 --- a/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch +++ b/target/linux/generic/patches-3.18/080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch @@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } #else /* CONFIG_IP_MULTIPLE_TABLES */ -@@ -247,20 +250,25 @@ static inline int fib_lookup(struct net +@@ -247,20 +250,25 @@ static inline int fib_lookup(struct net struct fib_result *res) { if (!net->ipv4.fib_has_custom_rules) { @@ -164,7 +164,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } static void nl_fib_input(struct sk_buff *skb) -@@ -952,7 +958,6 @@ static void nl_fib_input(struct sk_buff +@@ -952,7 +958,6 @@ static void nl_fib_input(struct sk_buff struct net *net; struct fib_result_nl *frn; struct nlmsghdr *nlh; @@ -172,7 +172,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> u32 portid; net = sock_net(skb->sk); -@@ -967,9 +972,7 @@ static void nl_fib_input(struct sk_buff +@@ -967,9 +972,7 @@ static void nl_fib_input(struct sk_buff nlh = nlmsg_hdr(skb); frn = (struct fib_result_nl *) nlmsg_data(nlh); |