---

yaml --- r: 55866 b: refs/heads/master c: d9de262 h: refs/heads/master v: v3
git-mirror · May 10, 2007 · e90e764 · e90e764
1 parent 28a4aaf
commit e90e764
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 643bd27298bdcc4e75b3e6a7ca459675eb5378c3
+refs/heads/master: d9de2622bd4fd29cab4ef7db66a9f916cb38e032
diff --git a/trunk/fs/compat_ioctl.c b/trunk/fs/compat_ioctl.c
@@ -3566,10 +3566,13 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
 			goto found_handler;
 	}
 
+#ifdef CONFIG_NET
 	if (S_ISSOCK(filp->f_path.dentry->d_inode->i_mode) &&
 	    cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
 		error = siocdevprivate_ioctl(fd, cmd, arg);
-	} else {
+	} else
+#endif
+	{
 		static int count;
 
 		if (++count <= 50)