From b2999d43bd907f085eddb7473d7db3c5f40174eb Mon Sep 17 00:00:00 2001 From: Stanislav Kinsbursky Date: Fri, 13 Jan 2012 13:09:03 +0400 Subject: [PATCH] --- yaml --- r: 294411 b: refs/heads/master c: 3065f1e29aa2716c8903cfeff368df4b5314040a h: refs/heads/master i: 294409: 2378a83602b5f8c4de039e69057e38d785a6b45d 294407: 34011df5502614b8efc8b9183e2aa60072b22129 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/addr.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 86a446330a49..af7409f93b53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7a30c18e8d673c996095420a026a28433cb4096 +refs/heads/master: 3065f1e29aa2716c8903cfeff368df4b5314040a diff --git a/trunk/net/sunrpc/addr.c b/trunk/net/sunrpc/addr.c index ee77742e0ed6..cc83de1c2224 100644 --- a/trunk/net/sunrpc/addr.c +++ b/trunk/net/sunrpc/addr.c @@ -156,8 +156,9 @@ static size_t rpc_pton4(const char *buf, const size_t buflen, } #if IS_ENABLED(CONFIG_IPV6) -static int rpc_parse_scope_id(const char *buf, const size_t buflen, - const char *delim, struct sockaddr_in6 *sin6) +static int rpc_parse_scope_id(struct net *net, const char *buf, + const size_t buflen, const char *delim, + struct sockaddr_in6 *sin6) { char *p; size_t len; @@ -177,7 +178,7 @@ static int rpc_parse_scope_id(const char *buf, const size_t buflen, unsigned long scope_id = 0; struct net_device *dev; - dev = dev_get_by_name(&init_net, p); + dev = dev_get_by_name(net, p); if (dev != NULL) { scope_id = dev->ifindex; dev_put(dev); @@ -213,7 +214,7 @@ static size_t rpc_pton6(const char *buf, const size_t buflen, if (in6_pton(buf, buflen, addr, IPV6_SCOPE_DELIMITER, &delim) == 0) return 0; - if (!rpc_parse_scope_id(buf, buflen, delim, sin6)) + if (!rpc_parse_scope_id(&init_net, buf, buflen, delim, sin6)) return 0; sin6->sin6_family = AF_INET6;