net: Make table id type u32

A number of VRF patches used 'int' for table id. It should be u32 to be
consistent with the rest of the stack.

Fixes:
4e3c89920cd3a ("net: Introduce VRF related flags and helpers")
15be405eb2ea9 ("net: Add inet_addr lookup by table")
30bbaa1950055 ("net: Fix up inet_addr_type checks")
021dd3b8a142d ("net: Add routes to the table associated with the device")
dc028da54ed35 ("inet: Move VRF table lookup to inlined function")
f6d3c19274c74 ("net: FIB tracepoints")

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 7 insertions, 7 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 96773a2f95a7..1d0c3adb6f34 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -428,7 +428,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         struct net *net = sock_net(sk);
         unsigned short snum;
         int chk_addr_ret;
-        int tb_id = RT_TABLE_LOCAL;
+        u32 tb_id = RT_TABLE_LOCAL;
         int err;
 
         /* If the socket has its own bind function then use it. (RAW) */
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 4036c94dfbe1..6fcbd215cdbc 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -213,7 +213,7 @@ void fib_flush_external(struct net *net)
  */
 static inline unsigned int __inet_dev_addr_type(struct net *net,
                                                 const struct net_device *dev,
-                                                __be32 addr, int tb_id)
+                                                __be32 addr, u32 tb_id)
 {
         struct flowi4           fl4 = { .daddr = addr };
         struct fib_result       res;
@@ -240,7 +240,7 @@ static inline unsigned int __inet_dev_addr_type(struct net *net,
         return ret;
 }
 
-unsigned int inet_addr_type_table(struct net *net, __be32 addr, int tb_id)
+unsigned int inet_addr_type_table(struct net *net, __be32 addr, u32 tb_id)
 {
         return __inet_dev_addr_type(net, NULL, addr, tb_id);
 }
@@ -255,7 +255,7 @@ EXPORT_SYMBOL(inet_addr_type);
 unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev,
                                 __be32 addr)
 {
-        int rt_table = vrf_dev_table(dev) ? : RT_TABLE_LOCAL;
+        u32 rt_table = vrf_dev_table(dev) ? : RT_TABLE_LOCAL;
 
         return __inet_dev_addr_type(net, dev, addr, rt_table);
 }
@@ -268,7 +268,7 @@ unsigned int inet_addr_type_dev_table(struct net *net,
                                       const struct net_device *dev,
                                       __be32 addr)
 {
-        int rt_table = vrf_dev_table(dev) ? : RT_TABLE_LOCAL;
+        u32 rt_table = vrf_dev_table(dev) ? : RT_TABLE_LOCAL;
 
         return __inet_dev_addr_type(net, NULL, addr, rt_table);
 }
@@ -803,7 +803,7 @@ out:
 static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifaddr *ifa)
 {
         struct net *net = dev_net(ifa->ifa_dev->dev);
-        int tb_id = vrf_dev_table_rtnl(ifa->ifa_dev->dev);
+        u32 tb_id = vrf_dev_table_rtnl(ifa->ifa_dev->dev);
         struct fib_table *tb;
         struct fib_config cfg = {
                 .fc_protocol = RTPROT_KERNEL,
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 992a9597daf8..064bd3caaa4f 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -863,7 +863,7 @@ static bool fib_valid_prefsrc(struct fib_config *cfg, __be32 fib_prefsrc)
 {
         if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst ||
             fib_prefsrc != cfg->fc_dst) {
-                int tb_id = cfg->fc_table;
+                u32 tb_id = cfg->fc_table;
 
                 if (tb_id == RT_TABLE_MAIN)
                         tb_id = RT_TABLE_LOCAL;