From: Alexander Aring <alex.aring@gmail.com>
To: hannes@stressinduktion.org
Cc: linux-nfs@vger.kernel.org, netdev@vger.kernel.org,
stable@vger.kernel.org, werner@almesberger.net,
Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH v2] nfs: fix dead code of ipv6_addr_scope
Date: Mon, 23 Dec 2013 00:01:16 +0100 [thread overview]
Message-ID: <1387753276-27009-1-git-send-email-alex.aring@gmail.com> (raw)
This patch corrects the check on a linklocal address.
Currently this can't be work, because ipv6_addr_scope returns a int with
a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL
is 0x02. So the condition is always false.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
- change check on linklocal address from
(ipv6_addr_src_scope(&a6->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL) to
(ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL) which is a
little bit faster.
- change commit msg.
fs/nfs/nfs4filelayoutdev.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
index c7c295e5..dc5e9e1 100644
--- a/fs/nfs/nfs4filelayoutdev.c
+++ b/fs/nfs/nfs4filelayoutdev.c
@@ -95,8 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
b6 = (struct sockaddr_in6 *)addr2;
/* LINKLOCAL addresses must have matching scope_id */
- if (ipv6_addr_scope(&a6->sin6_addr) ==
- IPV6_ADDR_SCOPE_LINKLOCAL &&
+ if (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL &&
a6->sin6_scope_id != b6->sin6_scope_id)
return false;
--
1.8.5.2
next reply other threads:[~2013-12-22 23:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-22 23:01 Alexander Aring [this message]
2013-12-23 3:18 ` [PATCH v2] nfs: fix dead code of ipv6_addr_scope Hannes Frederic Sowa
2013-12-24 17:35 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387753276-27009-1-git-send-email-alex.aring@gmail.com \
--to=alex.aring@gmail.com \
--cc=hannes@stressinduktion.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=werner@almesberger.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).