ACPI: Use menuconfig objects

[safe/jmp/linux-2.6] / fs / cifs / netmisc.c

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index fa5124d..53e304d 100644 (file)
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -30,6 +30,9 @@
 #include <linux/fs.h>
 #include <asm/div64.h>
 #include <asm/byteorder.h>
+#ifdef CONFIG_CIFS_EXPERIMENTAL
+#include <linux/inet.h>
+#endif
 #include "cifsfs.h"
 #include "cifspdu.h"
 #include "cifsglob.h"
@@ -129,11 +132,27 @@ static const struct smb_to_posix_error mapping_table_ERRHRD[] = {
 /* Convert string containing dotted ip address to binary form */
 /* returns 0 if invalid address */
 
-/* BB add address family, change rc to status flag and return union or for ipv6 */
-/*  will need parent to call something like inet_pton to convert ipv6 address  BB */
 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 */
+       /* BB Should we convert '/' slash to '\' here since it seems already done
+          before this */
+       if( address_family == AF_INET ){
+               ret = in4_pton(cp, -1 /* len */, dst , '\\', NULL);     
+       } else if( address_family == AF_INET6 ){
+               ret = in6_pton(cp, -1 /* len */, dst , '\\', NULL);
+       }
+#ifdef CONFIG_CIFS_DEBUG2
+       cFYI(1,("address conversion returned %d for %s", ret, cp));
+#endif
+       if (ret > 0)
+               ret = 1;
+       return ret;
+#else
        int value;
        int digit;
        int i;
@@ -192,6 +211,7 @@ cifs_inet_pton(int address_family, char *cp,void *dst)
 
        *((__be32 *)dst) = *((__be32 *) bytes) | htonl(value);
        return 1; /* success */
+#endif /* EXPERIMENTAL */      
 }
 
 /*****************************************************************************
@@ -918,45 +938,52 @@ __le64 cnvrtDosCifsTm(__u16 date, __u16 time)
 {
        return cpu_to_le64(cifs_UnixTimeToNT(cnvrtDosUnixTm(date, time)));
 }
+
 struct timespec cnvrtDosUnixTm(__u16 date, __u16 time)
 {
-       __u8  dt[2];
-       __u8  tm[2];
        struct timespec ts;
-       int sec,min, days, month, year;
-       struct timespec removeme; /* BB removeme BB */
-/*     SMB_TIME * st = (SMB_TIME *)&time;*/
+       int sec, min, days, month, year;
+       SMB_TIME * st = (SMB_TIME *)&time;
+       SMB_DATE * sd = (SMB_DATE *)&date;
 
        cFYI(1,("date %d time %d",date, time));
 
-       dt[0] = date & 0xFF;
-       dt[1] = (date & 0xFF00) >> 8;
-       tm[0] = time & 0xFF;
-       tm[1] = (time & 0xFF00) >> 8;
-
-       sec = tm[0] & 0x1F;
-       sec = 2 * sec;
-       min = ((tm[0] >>5)&0xFF) + ((tm[1] & 0x7)<<3);
-
+       sec = 2 * st->TwoSeconds;
+       min = st->Minutes;
+       if((sec > 59) || (min > 59))
+               cERROR(1,("illegal time min %d sec %d", min, sec));
        sec += (min * 60);
-       sec += 60 * 60 * ((tm[1] >> 3) &0xFF) /* hours */;
-       days = (dt[0] & 0x1F) - 1;
-       month = ((dt[0] >> 5) & 0xFF) + ((dt[1] & 0x1) <<3);
-       if(month > 12)
-               cERROR(1,("illegal month %d in date", month));
+       sec += 60 * 60 * st->Hours;
+       if(st->Hours > 24)
+               cERROR(1,("illegal hours %d",st->Hours));
+       days = sd->Day;
+       month = sd->Month;
+       if((days > 31) || (month > 12))
+               cERROR(1,("illegal date, month %d day: %d", month, days));
        month -= 1;
        days += total_days_of_prev_months[month];
-       days += 3653; /* account for difference in days between 1980 and 1970 */
-       year = (dt[1]>>1) & 0xFF;
+       days += 3652; /* account for difference in days between 1980 and 1970 */
+       year = sd->Year;
        days += year * 365;
        days += (year/4); /* leap year */
+       /* generalized leap year calculation is more complex, ie no leap year
+       for years/100 except for years/400, but since the maximum number for DOS
+        year is 2**7, the last year is 1980+127, which means we need only
+        consider 2 special case years, ie the years 2000 and 2100, and only
+        adjust for the lack of leap year for the year 2100, as 2000 was a 
+        leap year (divisable by 400) */
+       if(year >= 120)  /* the year 2100 */
+               days = days - 1;  /* do not count leap year for the year 2100 */
+
        /* adjust for leap year where we are still before leap day */
-       days -= ((year & 0x03) == 0) && (month < 2 ? 1 : 0);
+       if(year != 120)
+               days -= ((year & 0x03) == 0) && (month < 2 ? 1 : 0);
        sec += 24 * 60 * 60 * days; 
 
-       removeme = CURRENT_TIME; /* BB removeme BB */
        ts.tv_sec = sec;
 
+       /* cFYI(1,("sec after cnvrt dos to unix time %d",sec)); */
+
        ts.tv_nsec = 0;
        return ts;
 }