diff options
author | Patrick McHardy <kaber@trash.net> | 2006-08-11 02:08:33 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:54:24 -0400 |
commit | 2dfe55b47e3d66ded5a84caf71e0da5710edf48b (patch) | |
tree | f3818a7016985f79856212d797921e319bff8cd2 /net/decnet | |
parent | d924424aaed116b362c6d0e667d912b77e655085 (diff) |
[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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r-- | net/decnet/dn_fib.c | 6 | ||||
-rw-r--r-- | net/decnet/dn_table.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index ed5fb5c3eab5..7b3bf5c3d720 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c | |||
@@ -534,8 +534,8 @@ int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg) | |||
534 | 534 | ||
535 | int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) | 535 | int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) |
536 | { | 536 | { |
537 | int t; | 537 | u32 t; |
538 | int s_t; | 538 | u32 s_t; |
539 | struct dn_fib_table *tb; | 539 | struct dn_fib_table *tb; |
540 | 540 | ||
541 | if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && | 541 | if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && |
@@ -765,7 +765,7 @@ void dn_fib_flush(void) | |||
765 | { | 765 | { |
766 | int flushed = 0; | 766 | int flushed = 0; |
767 | struct dn_fib_table *tb; | 767 | struct dn_fib_table *tb; |
768 | int id; | 768 | u32 id; |
769 | 769 | ||
770 | for(id = RT_TABLE_MAX; id > 0; id--) { | 770 | for(id = RT_TABLE_MAX; id > 0; id--) { |
771 | if ((tb = dn_fib_get_table(id, 0)) == NULL) | 771 | if ((tb = dn_fib_get_table(id, 0)) == NULL) |
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index 2e01b67398c8..1601ee5406a8 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
@@ -264,7 +264,7 @@ static int dn_fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct dn_kern | |||
264 | } | 264 | } |
265 | 265 | ||
266 | static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, | 266 | static int dn_fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, |
267 | u8 tb_id, u8 type, u8 scope, void *dst, int dst_len, | 267 | u32 tb_id, u8 type, u8 scope, void *dst, int dst_len, |
268 | struct dn_fib_info *fi, unsigned int flags) | 268 | struct dn_fib_info *fi, unsigned int flags) |
269 | { | 269 | { |
270 | struct rtmsg *rtm; | 270 | struct rtmsg *rtm; |
@@ -327,7 +327,7 @@ rtattr_failure: | |||
327 | } | 327 | } |
328 | 328 | ||
329 | 329 | ||
330 | static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, int tb_id, | 330 | static void dn_rtmsg_fib(int event, struct dn_fib_node *f, int z, u32 tb_id, |
331 | struct nlmsghdr *nlh, struct netlink_skb_parms *req) | 331 | struct nlmsghdr *nlh, struct netlink_skb_parms *req) |
332 | { | 332 | { |
333 | struct sk_buff *skb; | 333 | struct sk_buff *skb; |
@@ -740,7 +740,7 @@ out: | |||
740 | } | 740 | } |
741 | 741 | ||
742 | 742 | ||
743 | struct dn_fib_table *dn_fib_get_table(int n, int create) | 743 | struct dn_fib_table *dn_fib_get_table(u32 n, int create) |
744 | { | 744 | { |
745 | struct dn_fib_table *t; | 745 | struct dn_fib_table *t; |
746 | 746 | ||
@@ -777,7 +777,7 @@ struct dn_fib_table *dn_fib_get_table(int n, int create) | |||
777 | return t; | 777 | return t; |
778 | } | 778 | } |
779 | 779 | ||
780 | static void dn_fib_del_tree(int n) | 780 | static void dn_fib_del_tree(u32 n) |
781 | { | 781 | { |
782 | struct dn_fib_table *t; | 782 | struct dn_fib_table *t; |
783 | 783 | ||
@@ -791,7 +791,7 @@ static void dn_fib_del_tree(int n) | |||
791 | 791 | ||
792 | struct dn_fib_table *dn_fib_empty_table(void) | 792 | struct dn_fib_table *dn_fib_empty_table(void) |
793 | { | 793 | { |
794 | int id; | 794 | u32 id; |
795 | 795 | ||
796 | for(id = RT_TABLE_MIN; id <= RT_TABLE_MAX; id++) | 796 | for(id = RT_TABLE_MIN; id <= RT_TABLE_MAX; id++) |
797 | if (dn_fib_tables[id] == NULL) | 797 | if (dn_fib_tables[id] == NULL) |