Skip to content

Commit

Permalink
[NET]: Use u32 for routing table IDs
Browse files Browse the repository at this point in the history 
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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Sep 22, 2006
1 parent d924424 commit 2dfe55b
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions include/net/dn_fib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions include/net/ip_fib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
}
Expand All @@ -205,17 +205,17 @@ 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;

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;
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions net/decnet/dn_fib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions net/decnet/dn_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/fib_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down Expand Up @@ -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) &&
Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/fib_hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,9 @@ static int fn_hash_dump(struct fib_table *tb, struct sk_buff *skb, struct netlin
}

#ifdef CONFIG_IP_MULTIPLE_TABLES
struct fib_table * fib_hash_init(int id)
struct fib_table * fib_hash_init(u32 id)
#else
struct fib_table * __init fib_hash_init(int id)
struct fib_table * __init fib_hash_init(u32 id)
#endif
{
struct fib_table *tb;
Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/fib_lookup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ extern struct fib_info *fib_create_info(const struct rtmsg *r,
extern int fib_nh_match(struct rtmsg *r, struct nlmsghdr *,
struct kern_rta *rta, struct fib_info *fi);
extern int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event,
u8 tb_id, u8 type, u8 scope, void *dst,
u32 tb_id, u8 type, u8 scope, void *dst,
int dst_len, u8 tos, struct fib_info *fi,
unsigned int);
extern void rtmsg_fib(int event, u32 key, struct fib_alias *fa,
int z, int tb_id,
int z, u32 tb_id,
struct nlmsghdr *n, struct netlink_skb_parms *req);
extern struct fib_alias *fib_find_alias(struct list_head *fah,
u8 tos, u32 prio);
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/fib_rules.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static int fib4_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)

static struct fib_table *fib_empty_table(void)
{
int id;
u32 id;

for (id = 1; id <= RT_TABLE_MAX; id++)
if (fib_tables[id] == NULL)
Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/fib_semantics.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ int ip_fib_check_default(u32 gw, struct net_device *dev)
}

void rtmsg_fib(int event, u32 key, struct fib_alias *fa,
int z, int tb_id,
int z, u32 tb_id,
struct nlmsghdr *n, struct netlink_skb_parms *req)
{
struct sk_buff *skb;
Expand Down Expand Up @@ -939,7 +939,7 @@ u32 __fib_res_prefsrc(struct fib_result *res)

int
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, u8 tos,
u32 tb_id, u8 type, u8 scope, void *dst, int dst_len, u8 tos,
struct fib_info *fi, unsigned int flags)
{
struct rtmsg *rtm;
Expand Down
6 changes: 3 additions & 3 deletions net/ipv4/fib_trie.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ fn_trie_insert(struct fib_table *tb, struct rtmsg *r, struct kern_rta *rta,

key = ntohl(key);

pr_debug("Insert table=%d %08x/%d\n", tb->tb_id, key, plen);
pr_debug("Insert table=%u %08x/%d\n", tb->tb_id, key, plen);

mask = ntohl(inet_make_mask(plen));

Expand Down Expand Up @@ -1943,9 +1943,9 @@ static int fn_trie_dump(struct fib_table *tb, struct sk_buff *skb, struct netlin
/* Fix more generic FIB names for init later */

#ifdef CONFIG_IP_MULTIPLE_TABLES
struct fib_table * fib_hash_init(int id)
struct fib_table * fib_hash_init(u32 id)
#else
struct fib_table * __init fib_hash_init(int id)
struct fib_table * __init fib_hash_init(u32 id)
#endif
{
struct fib_table *tb;
Expand Down

0 comments on commit 2dfe55b

Please sign in to comment.