diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-04 16:17:11 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-07 10:08:23 +0200 |
| commit | 4bdf1881dc6230b742d7efcaad8eeac4ed25f445 (patch) | |
| tree | b6902c8eeef29ee1d0a95d64bdbf5fc7e3ce26fe /nest | |
| parent | 0c8c8151fc1fb0dbfcd682153f50192ea1369884 (diff) | |
Channelize: rt_notify arg conversion table -> channel
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/proto-hooks.c | 2 | ||||
| -rw-r--r-- | nest/protocol.h | 2 | ||||
| -rw-r--r-- | nest/rt-table.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nest/proto-hooks.c b/nest/proto-hooks.c index e80f87ea..5923ff67 100644 --- a/nest/proto-hooks.c +++ b/nest/proto-hooks.c @@ -189,7 +189,7 @@ void ifa_notify(struct proto *p, unsigned flags, struct ifa *a) /** * rt_notify - notify instance about routing table change * @p: protocol instance - * @table: a routing table + * @channel: notifying channel * @net: a network entry * @new: new route for the network * @old: old route for the network diff --git a/nest/protocol.h b/nest/protocol.h index 41e31a80..19f5d070 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -184,7 +184,7 @@ struct proto { void (*if_notify)(struct proto *, unsigned flags, struct iface *i); void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a); - void (*rt_notify)(struct proto *, struct rtable *table, struct network *net, struct rte *new, struct rte *old, struct ea_list *attrs); + void (*rt_notify)(struct proto *, struct channel *, struct network *net, struct rte *new, struct rte *old, struct ea_list *attrs); void (*neigh_notify)(struct neighbor *neigh); struct ea_list *(*make_tmp_attrs)(struct rte *rt, struct linpool *pool); void (*store_tmp_attrs)(struct rte *rt, struct ea_list *attrs); diff --git a/nest/rt-table.c b/nest/rt-table.c index 2c9c6e3a..03ab3b92 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -481,18 +481,18 @@ do_rt_notify(struct channel *c, net *net, rte *new, rte *old, ea_list *tmpa, int rte_trace_out(D_ROUTES, p, old, "removed"); } if (!new) - p->rt_notify(p, c->table, net, NULL, old, NULL); + p->rt_notify(p, c, net, NULL, old, NULL); else if (tmpa) { ea_list *t = tmpa; while (t->next) t = t->next; t->next = new->attrs->eattrs; - p->rt_notify(p, c->table, net, new, old, tmpa); + p->rt_notify(p, c, net, new, old, tmpa); t->next = NULL; } else - p->rt_notify(p, c->table, net, new, old, new->attrs->eattrs); + p->rt_notify(p, c, net, new, old, new->attrs->eattrs); } static void @@ -552,7 +552,7 @@ rt_notify_basic(struct channel *c, net *net, rte *new0, rte *old0, int refeed) #ifdef CONFIG_PIPE if ((p->proto == &proto_pipe) && !new0 && (p != old0->sender->proto)) - p->rt_notify(p, c->table, net, NULL, old0, NULL); + p->rt_notify(p, c, net, NULL, old0, NULL); #endif return; |