kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 080-11-fib_trie-Push-rcu_read_lock-unlock-to-callers.patch

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 5c2dcf3..b36bcd8 100644 (file)
--- 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);