Skip to content

Commit

Permalink
net: Make table id type u32
Browse files Browse the repository at this point in the history 
A number of VRF patches used 'int' for table id. It should be u32 to be
consistent with the rest of the stack.

Fixes:
4e3c899 ("net: Introduce VRF related flags and helpers")
15be405 ("net: Add inet_addr lookup by table")
30bbaa1 ("net: Fix up inet_addr_type checks")
021dd3b ("net: Add routes to the table associated with the device")
dc028da ("inet: Move VRF table lookup to inlined function")
f6d3c19 ("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>
  • Loading branch information
David Ahern authored and David S. Miller committed Sep 1, 2015
1 parent 63b6c13 commit 9b8ff51
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion include/net/route.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ void ipv4_sk_redirect(struct sk_buff *skb, struct sock *sk);
void ip_rt_send_redirect(struct sk_buff *skb);

unsigned int inet_addr_type(struct net *net, __be32 addr);
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);
unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev,
__be32 addr);
unsigned int inet_addr_type_dev_table(struct net *net,
Expand Down
24 changes: 12 additions & 12 deletions include/net/vrf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ static inline int vrf_master_ifindex(const struct net_device *dev)
}

/* called with rcu_read_lock */
static inline int vrf_dev_table_rcu(const struct net_device *dev)
static inline u32 vrf_dev_table_rcu(const struct net_device *dev)
{
int tb_id = 0;
u32 tb_id = 0;

if (dev) {
struct net_vrf_dev *vrf_ptr;
Expand All @@ -80,9 +80,9 @@ static inline int vrf_dev_table_rcu(const struct net_device *dev)
return tb_id;
}

static inline int vrf_dev_table(const struct net_device *dev)
static inline u32 vrf_dev_table(const struct net_device *dev)
{
int tb_id;
u32 tb_id;

rcu_read_lock();
tb_id = vrf_dev_table_rcu(dev);
Expand All @@ -91,10 +91,10 @@ static inline int vrf_dev_table(const struct net_device *dev)
return tb_id;
}

static inline int vrf_dev_table_ifindex(struct net *net, int ifindex)
static inline u32 vrf_dev_table_ifindex(struct net *net, int ifindex)
{
struct net_device *dev;
int tb_id = 0;
u32 tb_id = 0;

if (!ifindex)
return 0;
Expand All @@ -111,9 +111,9 @@ static inline int vrf_dev_table_ifindex(struct net *net, int ifindex)
}

/* called with rtnl */
static inline int vrf_dev_table_rtnl(const struct net_device *dev)
static inline u32 vrf_dev_table_rtnl(const struct net_device *dev)
{
int tb_id = 0;
u32 tb_id = 0;

if (dev) {
struct net_vrf_dev *vrf_ptr;
Expand Down Expand Up @@ -149,22 +149,22 @@ static inline int vrf_master_ifindex(const struct net_device *dev)
return 0;
}

static inline int vrf_dev_table_rcu(const struct net_device *dev)
static inline u32 vrf_dev_table_rcu(const struct net_device *dev)
{
return 0;
}

static inline int vrf_dev_table(const struct net_device *dev)
static inline u32 vrf_dev_table(const struct net_device *dev)
{
return 0;
}

static inline int vrf_dev_table_ifindex(struct net *net, int ifindex)
static inline u32 vrf_dev_table_ifindex(struct net *net, int ifindex)
{
return 0;
}

static inline int vrf_dev_table_rtnl(const struct net_device *dev)
static inline u32 vrf_dev_table_rtnl(const struct net_device *dev)
{
return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions include/trace/events/fib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@

TRACE_EVENT(fib_table_lookup,

TP_PROTO(int tb_id, const struct flowi4 *flp),
TP_PROTO(u32 tb_id, const struct flowi4 *flp),

TP_ARGS(tb_id, flp),

TP_STRUCT__entry(
__field( int, tb_id )
__field( u32, tb_id )
__field( int, oif )
__field( int, iif )
__field( __u8, tos )
Expand All @@ -43,7 +43,7 @@ TRACE_EVENT(fib_table_lookup,
*p32 = flp->daddr;
),

TP_printk("table %d oif %d iif %d src %pI4 dst %pI4 tos %d scope %d flags %x",
TP_printk("table %u oif %d iif %d src %pI4 dst %pI4 tos %d scope %d flags %x",
__entry->tb_id, __entry->oif, __entry->iif,
__entry->src, __entry->dst, __entry->tos, __entry->scope,
__entry->flags)
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/af_inet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down
10 changes: 5 additions & 5 deletions net/ipv4/fib_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -803,7 +803,7 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
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,
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/fib_semantics.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9b8ff51

Please sign in to comment.