diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-01-30 21:24:41 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-01-30 21:24:41 +0000 |
| commit | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (patch) | |
| tree | ee984cfbde9590d0a5e43d551589c14241c38e95 | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
| download | op-kernel-dev-0e2bedaa394f74fa9f75ee937488c33d90039b5a.zip op-kernel-dev-0e2bedaa394f74fa9f75ee937488c33d90039b5a.tar.gz | |
[CIFS] ipv6_addr_equal for address comparison
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/connect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 2209be9..005df852 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -23,7 +23,6 @@ #include <linux/string.h> #include <linux/list.h> #include <linux/wait.h> -#include <linux/ipv6.h> #include <linux/pagemap.h> #include <linux/ctype.h> #include <linux/utsname.h> @@ -35,6 +34,7 @@ #include <linux/freezer.h> #include <asm/uaccess.h> #include <asm/processor.h> +#include <net/ipv6.h> #include "cifspdu.h" #include "cifsglob.h" #include "cifsproto.h" @@ -1379,8 +1379,8 @@ cifs_find_tcp_session(struct sockaddr_storage *addr) server->addr.sockAddr.sin_addr.s_addr)) continue; else if (addr->ss_family == AF_INET6 && - memcmp(&server->addr.sockAddr6.sin6_addr, - &addr6->sin6_addr, sizeof(addr6->sin6_addr))) + !ipv6_addr_equal(&server->addr.sockAddr6.sin6_addr, + &addr6->sin6_addr)) continue; ++server->srv_count; |
