Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dfe55b4 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET]: Use u32 for routing table IDs 



Use u32 for routing table IDs in net/ipv4 and net/decnet in preparation of
support for a larger number of routing tables. net/ipv6 already uses u32
everywhere and needs no further changes. No functional changes are made by
this patch.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d924424a

include/net/dn_fib.h

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct dn_fib_node { 




struct dn_fib_table {

	int n;

	u32 n;



	int (*insert)(struct dn_fib_table *t, struct rtmsg *r, 

			struct dn_kern_rta *rta, struct nlmsghdr *n,
@@ -137,7 +137,7 @@ extern int dn_fib_sync_up(struct net_device *dev); 
/*

 * dn_tables.c

 */

extern struct dn_fib_table *dn_fib_get_table(int n, int creat);

extern struct dn_fib_table *dn_fib_get_table(u32 n, int creat);

extern struct dn_fib_table *dn_fib_empty_table(void);

extern void dn_fib_table_init(void);

extern void dn_fib_table_cleanup(void);

include/net/ip_fib.h

+7 −7
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ struct fib_result_nl { 
#endif /* CONFIG_IP_ROUTE_MULTIPATH_WRANDOM */



struct fib_table {

	unsigned char	tb_id;

	u32		tb_id;

	unsigned	tb_stamp;

	int		(*tb_lookup)(struct fib_table *tb, const struct flowi *flp, struct fib_result *res);

	int		(*tb_insert)(struct fib_table *table, struct rtmsg *r,
@@ -173,14 +173,14 @@ struct fib_table { 
extern struct fib_table *ip_fib_local_table;

extern struct fib_table *ip_fib_main_table;



static inline struct fib_table *fib_get_table(int id)

static inline struct fib_table *fib_get_table(u32 id)

{

	if (id != RT_TABLE_LOCAL)

		return ip_fib_main_table;

	return ip_fib_local_table;

}



static inline struct fib_table *fib_new_table(int id)

static inline struct fib_table *fib_new_table(u32 id)

{

	return fib_get_table(id);

}
@@ -205,9 +205,9 @@ static inline void fib_select_default(const struct flowi *flp, struct fib_result 


extern struct fib_table * fib_tables[RT_TABLE_MAX+1];

extern int fib_lookup(struct flowi *flp, struct fib_result *res);

extern struct fib_table *__fib_new_table(int id);

extern struct fib_table *__fib_new_table(u32 id);



static inline struct fib_table *fib_get_table(int id)

static inline struct fib_table *fib_get_table(u32 id)

{

	if (id == 0)

		id = RT_TABLE_MAIN;
@@ -215,7 +215,7 @@ static inline struct fib_table *fib_get_table(int id) 
	return fib_tables[id];

}



static inline struct fib_table *fib_new_table(int id)

static inline struct fib_table *fib_new_table(u32 id)

{

	if (id == 0)

		id = RT_TABLE_MAIN;
@@ -248,7 +248,7 @@ extern int fib_convert_rtentry(int cmd, struct nlmsghdr *nl, struct rtmsg *rtm, 
extern u32  __fib_res_prefsrc(struct fib_result *res);



/* Exported by fib_hash.c */

extern struct fib_table *fib_hash_init(int id);

extern struct fib_table *fib_hash_init(u32 id);



#ifdef CONFIG_IP_MULTIPLE_TABLES

extern int fib4_rules_dump(struct sk_buff *skb, struct netlink_callback *cb);

net/decnet/dn_fib.c

+3 −3
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) 


int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)

{

	int t;

	int s_t;

	u32 t;

	u32 s_t;

	struct dn_fib_table *tb;



	if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
@@ -765,7 +765,7 @@ void dn_fib_flush(void) 
{

        int flushed = 0;

        struct dn_fib_table *tb;

        int id;

        u32 id;



        for(id = RT_TABLE_MAX; id > 0; id--) {

                if ((tb = dn_fib_get_table(id, 0)) == NULL)

net/decnet/dn_table.c

+5 −5
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int dn_fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct dn_kern 
}



static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,

                        u8 tb_id, u8 type, u8 scope, void *dst, int dst_len,

                        u32 tb_id, u8 type, u8 scope, void *dst, int dst_len,

                        struct dn_fib_info *fi, unsigned int flags)

{

        struct rtmsg *rtm;
@@ -327,7 +327,7 @@ static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, 
}





static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, int tb_id,

static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id,

                        struct nlmsghdr *nlh, struct netlink_skb_parms *req)

{

        struct sk_buff *skb;
@@ -740,7 +740,7 @@ static int dn_fib_table_lookup(struct dn_fib_table *tb, const struct flowi *flp, 
}





struct dn_fib_table *dn_fib_get_table(int n, int create)

struct dn_fib_table *dn_fib_get_table(u32 n, int create)

{

        struct dn_fib_table *t;
@@ -777,7 +777,7 @@ struct dn_fib_table *dn_fib_get_table(int n, int create) 
        return t;

}



static void dn_fib_del_tree(int n)

static void dn_fib_del_tree(u32 n)

{

	struct dn_fib_table *t;
@@ -791,7 +791,7 @@ static void dn_fib_del_tree(int n) 


struct dn_fib_table *dn_fib_empty_table(void)

{

        int id;

        u32 id;



        for(id = RT_TABLE_MIN; id <= RT_TABLE_MAX; id++)

                if (dn_fib_tables[id] == NULL)

net/ipv4/fib_frontend.c

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct fib_table *ip_fib_main_table; 


struct fib_table *fib_tables[RT_TABLE_MAX+1];



struct fib_table *__fib_new_table(int id)

struct fib_table *__fib_new_table(u32 id)

{

	struct fib_table *tb;
@@ -82,7 +82,7 @@ static void fib_flush(void) 
	int flushed = 0;

#ifdef CONFIG_IP_MULTIPLE_TABLES

	struct fib_table *tb;

	int id;

	u32 id;



	for (id = RT_TABLE_MAX; id>0; id--) {

		if ((tb = fib_get_table(id))==NULL)
@@ -333,8 +333,8 @@ int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg) 


int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)

{

	int t;

	int s_t;

	u32 t;

	u32 s_t;

	struct fib_table *tb;



	if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&