git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET]: Make the device list and device lookups per namespace.
[pandora-kernel.git]
/
net
/
ipv6
/
sit.c
diff --git
a/net/ipv6/sit.c
b/net/ipv6/sit.c
index
eb20bb6
..
e79f419
100644
(file)
--- a/
net/ipv6/sit.c
+++ b/
net/ipv6/sit.c
@@
-167,7
+167,7
@@
static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
int i;
for (i=1; i<100; i++) {
sprintf(name, "sit%d", i);
int i;
for (i=1; i<100; i++) {
sprintf(name, "sit%d", i);
- if (__dev_get_by_name(name) == NULL)
+ if (__dev_get_by_name(
&init_net,
name) == NULL)
break;
}
if (i==100)
break;
}
if (i==100)
@@
-761,7
+761,7
@@
static int ipip6_tunnel_init(struct net_device *dev)
}
if (!tdev && tunnel->parms.link)
}
if (!tdev && tunnel->parms.link)
- tdev = __dev_get_by_index(tunnel->parms.link);
+ tdev = __dev_get_by_index(
&init_net,
tunnel->parms.link);
if (tdev) {
dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);
if (tdev) {
dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);