[CIFS] ipv6 support no longer experimental

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index af3689bfa38ec0163f48095afe53ec3934027f6b..ee8ab87f27aa01b22831963237a5f542220109b8 100644 (file)
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -101,5 +101,5 @@ extern ssize_t      cifs_getxattr(struct dentry *, const char *, void *, size_t);
 extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
 extern int cifs_ioctl (struct inode *inode, struct file *filep,
                       unsigned int command, unsigned long arg);
-#define CIFS_VERSION   "1.49"
+#define CIFS_VERSION   "1.50"
 #endif                         /* _CIFSFS_H */

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index 53e304d59544cbeddff71ea909904ad084106d42..b388c356fde08ea87c8b777956518882ed02bafb 100644 (file)
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -135,7 +135,6 @@ static const struct smb_to_posix_error mapping_table_ERRHRD[] = {
 int
 cifs_inet_pton(int address_family, char *cp,void *dst)
 {
-#ifdef CONFIG_CIFS_EXPERIMENTAL
        int ret = 0;
 
        /* calculate length by finding first slash or NULL */
@@ -152,66 +151,6 @@ cifs_inet_pton(int address_family, char *cp,void *dst)
        if (ret > 0)
                ret = 1;
        return ret;
-#else
-       int value;
-       int digit;
-       int i;
-       char temp;
-       char bytes[4];
-       char *end = bytes;
-       static const int addr_class_max[4] =
-           { 0xffffffff, 0xffffff, 0xffff, 0xff };
-
-       if(address_family != AF_INET)
-               return -EAFNOSUPPORT;
-
-       for (i = 0; i < 4; i++) {
-               bytes[i] = 0;
-       }
-
-       temp = *cp;
-
-       while (TRUE) {
-               if (!isdigit(temp))
-                       return 0;
-
-               value = 0;
-               digit = 0;
-               for (;;) {
-                       if (isascii(temp) && isdigit(temp)) {
-                               value = (value * 10) + temp - '0';
-                               temp = *++cp;
-                               digit = 1;
-                       } else
-                               break;
-               }
-
-               if (temp == '.') {
-                       if ((end > bytes + 2) || (value > 255))
-                               return 0;
-                       *end++ = value;
-                       temp = *++cp;
-               } else if (temp == ':') {
-                       cFYI(1,("IPv6 addresses not supported for CIFS mounts yet"));
-                       return -1;
-               } else
-                       break;
-       }
-
-       /* check for last characters */
-       if (temp != '\0' && (!isascii(temp) || !isspace(temp)))
-               if (temp != '\\') {
-                       if (temp != '/')
-                               return 0;
-                       else
-                               (*cp = '\\');   /* switch the slash the expected way */
-               }
-       if (value > addr_class_max[end - bytes])
-               return 0;
-
-       *((__be32 *)dst) = *((__be32 *) bytes) | htonl(value);
-       return 1; /* success */
-#endif /* EXPERIMENTAL */      
 }
 
 /*****************************************************************************