xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Make table id type u32

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

Fixes:
4e3c89920c ("net: Introduce VRF related flags and helpers")
15be405eb2 ("net: Add inet_addr lookup by table")
30bbaa1950 ("net: Fix up inet_addr_type checks")
021dd3b8a1 ("net: Add routes to the table associated with the device")
dc028da54e ("inet: Move VRF table lookup to inlined function")
f6d3c19274 ("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>
This commit is contained in:
David Ahern
2015-09-01 14:26:35 -06:00
committed by David S. Miller
parent 63b6c13dbb
commit 9b8ff51822
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/net/vrf.h
View File

@@ -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;
@@ -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);
@@ -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;
@@ -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;
@@ -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;
}