diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2008-01-10 03:25:28 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 15:01:27 -0800 |
| commit | 6b175b26c1048d331508940ad3516ead1998084f (patch) | |
| tree | 810b0a18cee4d87c573274fdfd4a59fc624cfed2 /net/ipv4/fib_frontend.c | |
| parent | [NETNS]: Add netns parameter to fib_get_table/fib_new_table. (diff) | |
| download | linux-dev-6b175b26c1048d331508940ad3516ead1998084f.tar.xz linux-dev-6b175b26c1048d331508940ad3516ead1998084f.zip | |
[NETNS]: Add netns parameter to inet_(dev_)add_type.
The patch extends the inet_addr_type and inet_dev_addr_type with the
network namespace pointer. That allows to access the different tables
relatively to the network namespace.
The modification of the signature function is reported in all the
callers of the inet_addr_type using the pointer to the well known
init_net.
Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
| -rw-r--r-- | net/ipv4/fib_frontend.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 7718823711e3..d1a45cb6f6b0 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -166,7 +166,8 @@ out: * Find address type as if only "dev" was present in the system. If * on_dev is NULL then all interfaces are taken into consideration. */ -static inline unsigned __inet_dev_addr_type(const struct net_device *dev, +static inline unsigned __inet_dev_addr_type(struct net *net, + const struct net_device *dev, __be32 addr) { struct flowi fl = { .nl_u = { .ip4_u = { .daddr = addr } } }; @@ -183,7 +184,7 @@ static inline unsigned __inet_dev_addr_type(const struct net_device *dev, res.r = NULL; #endif - local_table = fib_get_table(&init_net, RT_TABLE_LOCAL); + local_table = fib_get_table(net, RT_TABLE_LOCAL); if (local_table) { ret = RTN_UNICAST; if (!local_table->tb_lookup(local_table, &fl, &res)) { @@ -195,14 +196,15 @@ static inline unsigned __inet_dev_addr_type(const struct net_device *dev, return ret; } -unsigned int inet_addr_type(__be32 addr) +unsigned int inet_addr_type(struct net *net, __be32 addr) { - return __inet_dev_addr_type(NULL, addr); + return __inet_dev_addr_type(net, NULL, addr); } -unsigned int inet_dev_addr_type(const struct net_device *dev, __be32 addr) +unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev, + __be32 addr) { - return __inet_dev_addr_type(dev, addr); + return __inet_dev_addr_type(net, dev, addr); } /* Given (packet source, input interface) and optional (dst, oif, tos): @@ -391,7 +393,7 @@ static int rtentry_to_fib_config(int cmd, struct rtentry *rt, if (rt->rt_gateway.sa_family == AF_INET && addr) { cfg->fc_gw = addr; if (rt->rt_flags & RTF_GATEWAY && - inet_addr_type(addr) == RTN_UNICAST) + inet_addr_type(&init_net, addr) == RTN_UNICAST) cfg->fc_scope = RT_SCOPE_UNIVERSE; } @@ -782,7 +784,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa) fib_magic(RTM_DELROUTE, RTN_LOCAL, ifa->ifa_local, 32, prim); /* Check, that this local address finally disappeared. */ - if (inet_addr_type(ifa->ifa_local) != RTN_LOCAL) { + if (inet_addr_type(&init_net, ifa->ifa_local) != RTN_LOCAL) { /* And the last, but not the least thing. We must flush stray FIB entries. |