--- ltp.orig/testcases/kernel/syscalls/sockioctl/sockioctl01.c	2011-09-05 08:42:12.000000000 +0200
+++ ltp/testcases/kernel/syscalls/sockioctl/sockioctl01.c	2011-09-05 08:47:52.000000000 +0200
@@ -227,6 +227,12 @@ void setup1(void)
 			 strerror(errno));
 	}
 	sinlen = sizeof(fsin1);
+
+	if (strncmp(tdat[testno].desc, "ATMARK on UDP", 14) == 0) {
+                if ( tst_kvercmp(2,6,39) >= 0 || tst_kvercmp(3,0,0) >= 0 ) {
+                        tdat[testno].experrno = ENOTTY;
+                }
+        }
 }
 
 void setup2(void)
@@ -254,4 +260,4 @@ void cleanup1(void)
 {
 	(void)close(s);
 	s = -1;
-}
\ No newline at end of file
+}