Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 170421
b: refs/heads/master
c: 16c6cf8
h: refs/heads/master
i:
  170419: 9b7d973
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Oct 5, 2009
1 parent a515dc2 commit 51126d1
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 57 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 977750076d98c7ff6cbda51858bb5a5894a9d9ab
refs/heads/master: 16c6cf8bb471392fd09b48b7c27e7d83a446b4bc
25 changes: 14 additions & 11 deletions trunk/include/net/ip_fib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,18 +144,21 @@ struct fib_table {
struct hlist_node tb_hlist;
u32 tb_id;
int tb_default;
int (*tb_lookup)(struct fib_table *tb, const struct flowi *flp, struct fib_result *res);
int (*tb_insert)(struct fib_table *, struct fib_config *);
int (*tb_delete)(struct fib_table *, struct fib_config *);
int (*tb_dump)(struct fib_table *table, struct sk_buff *skb,
struct netlink_callback *cb);
int (*tb_flush)(struct fib_table *table);
void (*tb_select_default)(struct fib_table *table,
const struct flowi *flp, struct fib_result *res);

unsigned char tb_data[0];
};

extern int fib_table_lookup(struct fib_table *tb, const struct flowi *flp,
struct fib_result *res);
extern int fib_table_insert(struct fib_table *, struct fib_config *);
extern int fib_table_delete(struct fib_table *, struct fib_config *);
extern int fib_table_dump(struct fib_table *table, struct sk_buff *skb,
struct netlink_callback *cb);
extern int fib_table_flush(struct fib_table *table);
extern void fib_table_select_default(struct fib_table *table,
const struct flowi *flp,
struct fib_result *res);


#ifndef CONFIG_IP_MULTIPLE_TABLES

#define TABLE_LOCAL_INDEX 0
Expand All @@ -182,11 +185,11 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp,
struct fib_table *table;

table = fib_get_table(net, RT_TABLE_LOCAL);
if (!table->tb_lookup(table, flp, res))
if (!fib_table_lookup(table, flp, res))
return 0;

table = fib_get_table(net, RT_TABLE_MAIN);
if (!table->tb_lookup(table, flp, res))
if (!fib_table_lookup(table, flp, res))
return 0;
return -ENETUNREACH;
}
Expand Down
26 changes: 13 additions & 13 deletions trunk/net/ipv4/fib_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void fib_select_default(struct net *net,
#endif
tb = fib_get_table(net, table);
if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
tb->tb_select_default(tb, flp, res);
fib_table_select_default(tb, flp, res);
}

static void fib_flush(struct net *net)
Expand All @@ -139,7 +139,7 @@ static void fib_flush(struct net *net)
for (h = 0; h < FIB_TABLE_HASHSZ; h++) {
head = &net->ipv4.fib_table_hash[h];
hlist_for_each_entry(tb, node, head, tb_hlist)
flushed += tb->tb_flush(tb);
flushed += fib_table_flush(tb);
}

if (flushed)
Expand All @@ -162,7 +162,7 @@ struct net_device * ip_dev_find(struct net *net, __be32 addr)
#endif

local_table = fib_get_table(net, RT_TABLE_LOCAL);
if (!local_table || local_table->tb_lookup(local_table, &fl, &res))
if (!local_table || fib_table_lookup(local_table, &fl, &res))
return NULL;
if (res.type != RTN_LOCAL)
goto out;
Expand Down Expand Up @@ -200,7 +200,7 @@ static inline unsigned __inet_dev_addr_type(struct net *net,
local_table = fib_get_table(net, RT_TABLE_LOCAL);
if (local_table) {
ret = RTN_UNICAST;
if (!local_table->tb_lookup(local_table, &fl, &res)) {
if (!fib_table_lookup(local_table, &fl, &res)) {
if (!dev || dev == res.fi->fib_dev)
ret = res.type;
fib_res_put(&res);
Expand Down Expand Up @@ -473,13 +473,13 @@ int ip_rt_ioctl(struct net *net, unsigned int cmd, void __user *arg)
if (cmd == SIOCDELRT) {
tb = fib_get_table(net, cfg.fc_table);
if (tb)
err = tb->tb_delete(tb, &cfg);
err = fib_table_delete(tb, &cfg);
else
err = -ESRCH;
} else {
tb = fib_new_table(net, cfg.fc_table);
if (tb)
err = tb->tb_insert(tb, &cfg);
err = fib_table_insert(tb, &cfg);
else
err = -ENOBUFS;
}
Expand Down Expand Up @@ -594,7 +594,7 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *ar
goto errout;
}

err = tb->tb_delete(tb, &cfg);
err = fib_table_delete(tb, &cfg);
errout:
return err;
}
Expand All @@ -616,7 +616,7 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *ar
goto errout;
}

err = tb->tb_insert(tb, &cfg);
err = fib_table_insert(tb, &cfg);
errout:
return err;
}
Expand Down Expand Up @@ -647,7 +647,7 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
if (dumped)
memset(&cb->args[2], 0, sizeof(cb->args) -
2 * sizeof(cb->args[0]));
if (tb->tb_dump(tb, skb, cb) < 0)
if (fib_table_dump(tb, skb, cb) < 0)
goto out;
dumped = 1;
next:
Expand Down Expand Up @@ -701,9 +701,9 @@ static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifad
cfg.fc_scope = RT_SCOPE_HOST;

if (cmd == RTM_NEWROUTE)
tb->tb_insert(tb, &cfg);
fib_table_insert(tb, &cfg);
else
tb->tb_delete(tb, &cfg);
fib_table_delete(tb, &cfg);
}

void fib_add_ifaddr(struct in_ifaddr *ifa)
Expand Down Expand Up @@ -832,7 +832,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
local_bh_disable();

frn->tb_id = tb->tb_id;
frn->err = tb->tb_lookup(tb, &fl, &res);
frn->err = fib_table_lookup(tb, &fl, &res);

if (!frn->err) {
frn->prefixlen = res.prefixlen;
Expand Down Expand Up @@ -1009,7 +1009,7 @@ static void __net_exit ip_fib_net_exit(struct net *net)
head = &net->ipv4.fib_table_hash[i];
hlist_for_each_entry_safe(tb, node, tmp, head, tb_hlist) {
hlist_del(node);
tb->tb_flush(tb);
fib_table_flush(tb);
kfree(tb);
}
}
Expand Down
25 changes: 10 additions & 15 deletions trunk/net/ipv4/fib_hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ fn_new_zone(struct fn_hash *table, int z)
return fz;
}

static int
fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result *res)
int fib_table_lookup(struct fib_table *tb,
const struct flowi *flp, struct fib_result *res)
{
int err;
struct fn_zone *fz;
Expand Down Expand Up @@ -274,8 +274,8 @@ fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result
return err;
}

static void
fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib_result *res)
void fib_table_select_default(struct fib_table *tb,
const struct flowi *flp, struct fib_result *res)
{
int order, last_idx;
struct hlist_node *node;
Expand Down Expand Up @@ -366,7 +366,7 @@ static struct fib_node *fib_find_node(struct fn_zone *fz, __be32 key)
return NULL;
}

static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg)
int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
{
struct fn_hash *table = (struct fn_hash *) tb->tb_data;
struct fib_node *new_f = NULL;
Expand Down Expand Up @@ -544,8 +544,7 @@ static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg)
return err;
}


static int fn_hash_delete(struct fib_table *tb, struct fib_config *cfg)
int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
{
struct fn_hash *table = (struct fn_hash *)tb->tb_data;
struct fib_node *f;
Expand Down Expand Up @@ -662,7 +661,7 @@ static int fn_flush_list(struct fn_zone *fz, int idx)
return found;
}

static int fn_hash_flush(struct fib_table *tb)
int fib_table_flush(struct fib_table *tb)
{
struct fn_hash *table = (struct fn_hash *) tb->tb_data;
struct fn_zone *fz;
Expand Down Expand Up @@ -743,7 +742,8 @@ fn_hash_dump_zone(struct sk_buff *skb, struct netlink_callback *cb,
return skb->len;
}

static int fn_hash_dump(struct fib_table *tb, struct sk_buff *skb, struct netlink_callback *cb)
int fib_table_dump(struct fib_table *tb, struct sk_buff *skb,
struct netlink_callback *cb)
{
int m, s_m;
struct fn_zone *fz;
Expand Down Expand Up @@ -787,12 +787,7 @@ struct fib_table *fib_hash_table(u32 id)

tb->tb_id = id;
tb->tb_default = -1;
tb->tb_lookup = fn_hash_lookup;
tb->tb_insert = fn_hash_insert;
tb->tb_delete = fn_hash_delete;
tb->tb_flush = fn_hash_flush;
tb->tb_select_default = fn_hash_select_default;
tb->tb_dump = fn_hash_dump;

memset(tb->tb_data, 0, sizeof(struct fn_hash));
return tb;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/ipv4/fib_rules.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int fib4_rule_action(struct fib_rule *rule, struct flowi *flp,
if ((tbl = fib_get_table(rule->fr_net, rule->table)) == NULL)
goto errout;

err = tbl->tb_lookup(tbl, flp, (struct fib_result *) arg->result);
err = fib_table_lookup(tbl, flp, (struct fib_result *) arg->result);
if (err > 0)
err = -EAGAIN;
errout:
Expand Down
26 changes: 10 additions & 16 deletions trunk/net/ipv4/fib_trie.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
/*
* Caller must hold RTNL.
*/
static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg)
int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
{
struct trie *t = (struct trie *) tb->tb_data;
struct fib_alias *fa, *new_fa;
Expand Down Expand Up @@ -1373,8 +1373,8 @@ static int check_leaf(struct trie *t, struct leaf *l,
return 1;
}

static int fn_trie_lookup(struct fib_table *tb, const struct flowi *flp,
struct fib_result *res)
int fib_table_lookup(struct fib_table *tb, const struct flowi *flp,
struct fib_result *res)
{
struct trie *t = (struct trie *) tb->tb_data;
int ret;
Expand Down Expand Up @@ -1595,7 +1595,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l)
/*
* Caller must hold RTNL.
*/
static int fn_trie_delete(struct fib_table *tb, struct fib_config *cfg)
int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
{
struct trie *t = (struct trie *) tb->tb_data;
u32 key, mask;
Expand Down Expand Up @@ -1786,7 +1786,7 @@ static struct leaf *trie_leafindex(struct trie *t, int index)
/*
* Caller must hold RTNL.
*/
static int fn_trie_flush(struct fib_table *tb)
int fib_table_flush(struct fib_table *tb)
{
struct trie *t = (struct trie *) tb->tb_data;
struct leaf *l, *ll = NULL;
Expand All @@ -1807,9 +1807,9 @@ static int fn_trie_flush(struct fib_table *tb)
return found;
}

static void fn_trie_select_default(struct fib_table *tb,
const struct flowi *flp,
struct fib_result *res)
void fib_table_select_default(struct fib_table *tb,
const struct flowi *flp,
struct fib_result *res)
{
struct trie *t = (struct trie *) tb->tb_data;
int order, last_idx;
Expand Down Expand Up @@ -1952,8 +1952,8 @@ static int fn_trie_dump_leaf(struct leaf *l, struct fib_table *tb,
return skb->len;
}

static int fn_trie_dump(struct fib_table *tb, struct sk_buff *skb,
struct netlink_callback *cb)
int fib_table_dump(struct fib_table *tb, struct sk_buff *skb,
struct netlink_callback *cb)
{
struct leaf *l;
struct trie *t = (struct trie *) tb->tb_data;
Expand Down Expand Up @@ -2020,12 +2020,6 @@ struct fib_table *fib_hash_table(u32 id)

tb->tb_id = id;
tb->tb_default = -1;
tb->tb_lookup = fn_trie_lookup;
tb->tb_insert = fn_trie_insert;
tb->tb_delete = fn_trie_delete;
tb->tb_flush = fn_trie_flush;
tb->tb_select_default = fn_trie_select_default;
tb->tb_dump = fn_trie_dump;

t = (struct trie *) tb->tb_data;
memset(t, 0, sizeof(*t));
Expand Down

0 comments on commit 51126d1

Please sign in to comment.