ipv4: Make final arg to ip_route_output_flow to be boolean "can_sleep"

Since that is what the current vague "flags" argument means.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index d02dcc6e5963bf99f35020525d0c4c2c306c5464..c7f776c8b2b8a640520cc2543354d179ecee0bc8 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -354,7 +354,7 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip,
                          }
        };
 
-       if (ip_route_output_flow(&init_net, &rt, &fl, NULL, 0))
+       if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))
                return NULL;
        return rt;
 }

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 8b00e6c46f01db0e71f69e2ba0dd6c07e3a1cb59..5542c994338da7aeac85fb446d93380073b2aed9 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -331,7 +331,7 @@ static struct rtable *find_route(struct c4iw_dev *dev, __be32 local_ip,
                          }
        };
 
-       if (ip_route_output_flow(&init_net, &rt, &fl, NULL, 0))
+       if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))
                return NULL;
        return rt;
 }

diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index d2ad3d6767246d34d0bc2ffcfd187d5d60e65fe9..fabca75ac2f28bde44af781f63a9952163ed5acc 100644 (file)
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -470,7 +470,7 @@ static struct rtable *find_route_ipv4(__be32 saddr, __be32 daddr,
                        }
        };
 
-       if (ip_route_output_flow(&init_net, &rt, &fl, NULL, 0))
+       if (ip_route_output_flow(&init_net, &rt, &fl, NULL, false))
                return NULL;
 
        return rt;

diff --git a/include/net/route.h b/include/net/route.h
index 5e0826d1c0e04998f0a0d045b13b78a457eac379..6de4333d600244227c97f7d6344bcb9453cc7cbe 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -120,7 +120,7 @@ extern void         rt_cache_flush(struct net *net, int how);
 extern void            rt_cache_flush_batch(struct net *net);
 extern int             __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp);
 extern int             ip_route_output_key(struct net *, struct rtable **, struct flowi *flp);
-extern int             ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags);
+extern int             ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, bool can_sleep);
 
 extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
                                 u8 tos, struct net_device *devin, bool noref);
@@ -196,7 +196,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst,
                *rp = NULL;
        }
        security_sk_classify_flow(sk, &fl);
-       return ip_route_output_flow(net, rp, &fl, sk, can_sleep ? 1 : 0);
+       return ip_route_output_flow(net, rp, &fl, sk, can_sleep);
 }
 
 static inline int ip_route_newports(struct rtable **rp, u8 protocol,
@@ -220,7 +220,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol,
                ip_rt_put(*rp);
                *rp = NULL;
                security_sk_classify_flow(sk, &fl);
-               return ip_route_output_flow(sock_net(sk), rp, &fl, sk, 0);
+               return ip_route_output_flow(sock_net(sk), rp, &fl, sk, false);
        }
        return 0;
 }

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 8372d5c571a0e744cea63fe194aeabce389ea531..3d4b82f6adfdcd037c4b4341c6f1cc2631233182 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -475,7 +475,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,
                          };
 
        security_skb_classify_flow(skb, &fl);
-       if (ip_route_output_flow(net, &rt, &fl, sk, 0)) {
+       if (ip_route_output_flow(net, &rt, &fl, sk, false)) {
                IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);
                return NULL;
        }

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index d16687db97134e45dd4cd7bdd9689e4e6ae479b7..7d90fe0ee5a6745dd73634d1401606e542f87f50 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1174,7 +1174,7 @@ int inet_sk_rebuild_header(struct sock *sk)
        };
 
        security_sk_classify_flow(sk, &fl);
-       err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
+       err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, false);
 }
        if (!err)
                sk_setup_caps(sk, &rt->dst);

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 97e5fb76526500d6355b921be6359680bf7a8720..0caeb69de4b143286e41b6e22ca1c18ba82c1f28 100644 (file)
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -369,7 +369,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
        struct net *net = sock_net(sk);
 
        security_req_classify_flow(req, &fl);
-       if (ip_route_output_flow(net, &rt, &fl, sk, 0))
+       if (ip_route_output_flow(net, &rt, &fl, sk, false))
                goto no_route;
        if (opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway)
                goto route_err;

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 460308c350280cb3b695982efe6c126267eab6ae..e6905c562fb74c79098e28b4c9195a6007822e68 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -355,7 +355,7 @@ int ip_queue_xmit(struct sk_buff *skb)
                         * itself out.
                         */
                        security_sk_classify_flow(sk, &fl);
-                       if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0))
+                       if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, false))
                                goto no_route;
                }
                sk_setup_caps(sk, &rt->dst);

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 6390ba299b3da53cefaf1daa7668bbfcd46d441f..e1857658964d33e576d3f2acec59eb5ad77d57ab 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -563,7 +563,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                }
 
                security_sk_classify_flow(sk, &fl);
-               err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 1);
+               err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, true);
        }
        if (err)
                goto done;

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 52b077d4520806e21aca9fb7cd4fc39ada59562d..1ac3ecaf36e8715771eb6522b6aa637871b348a6 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2720,7 +2720,7 @@ static int ipv4_dst_blackhole(struct net *net, struct rtable **rp, struct flowi
 }
 
 int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp,
-                        struct sock *sk, int flags)
+                        struct sock *sk, bool can_sleep)
 {
        int err;
 
@@ -2733,7 +2733,7 @@ int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp,
                if (!flp->fl4_dst)
                        flp->fl4_dst = (*rp)->rt_dst;
                err = __xfrm_lookup(net, (struct dst_entry **)rp, flp, sk,
-                                   flags ? XFRM_LOOKUP_WAIT : 0);
+                                   can_sleep ? XFRM_LOOKUP_WAIT : 0);
                if (err == -EREMOTE)
                        err = ipv4_dst_blackhole(net, rp, flp);
 
@@ -2746,7 +2746,7 @@ EXPORT_SYMBOL_GPL(ip_route_output_flow);
 
 int ip_route_output_key(struct net *net, struct rtable **rp, struct flowi *flp)
 {
-       return ip_route_output_flow(net, rp, flp, NULL, 0);
+       return ip_route_output_flow(net, rp, flp, NULL, false);
 }
 EXPORT_SYMBOL(ip_route_output_key);
 

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 8155d6eda3769f455857fe5524b1b4dc8311db05..790187b5c308b28e11765e2a22293bc2596acf54 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -920,7 +920,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                struct net *net = sock_net(sk);
 
                security_sk_classify_flow(sk, &fl);
-               err = ip_route_output_flow(net, &rt, &fl, sk, 1);
+               err = ip_route_output_flow(net, &rt, &fl, sk, true);
                if (err) {
                        if (err == -ENETUNREACH)
                                IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 28e876a6b1dd9b620652c175b2ab1a8a339e7294..7744a8e4b4c6683bd015802b95765737838ee7c8 100644 (file)
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -489,7 +489,7 @@ static int l2tp_ip_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
                         * itself out.
                         */
                        security_sk_classify_flow(sk, &fl);
-                       if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0))
+                       if (ip_route_output_flow(sock_net(sk), &rt, &fl, sk, false))
                                goto no_route;
                }
                sk_setup_caps(sk, &rt->dst);