diff --git a/[refs] b/[refs] index ae825a19bfc5..90d02d9b3246 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a97146cc6e8145f65abfee36e56de7b8061c34f +refs/heads/master: b0970c428b33ee6e0aa576f58f87dde74262a441 diff --git a/trunk/net/ipv4/tunnel4.c b/trunk/net/ipv4/tunnel4.c index cc4cd0e518cc..d3b709a6f264 100644 --- a/trunk/net/ipv4/tunnel4.c +++ b/trunk/net/ipv4/tunnel4.c @@ -144,6 +144,7 @@ static struct net_protocol tunnel64_protocol = { .handler = tunnel64_rcv, .err_handler = tunnel64_err, .no_policy = 1, + .netns_ok = 1, }; #endif