---

yaml --- r: 57158 b: refs/heads/master c: ddc31ce h: refs/heads/master v: v3
git-mirror · May 31, 2007 · d2c83e9 · d2c83e9
1 parent 2f84ef5
commit d2c83e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f282d45cb496e3960046afd3d5f241265eda6fde
+refs/heads/master: ddc31ce311b65fc3c30ec9ca5baf688a882260bc
diff --git a/trunk/net/ipv4/fib_frontend.c b/trunk/net/ipv4/fib_frontend.c
@@ -250,8 +250,6 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
 	return -EINVAL;
 }
 
-#ifndef CONFIG_IP_NOSIOCRT
-
 static inline __be32 sk_extract_addr(struct sockaddr *addr)
 {
 	return ((struct sockaddr_in *) addr)->sin_addr.s_addr;
@@ -443,15 +441,6 @@ int ip_rt_ioctl(unsigned int cmd, void __user *arg)
 	return -EINVAL;
 }
 
-#else
-
-int ip_rt_ioctl(unsigned int cmd, void *arg)
-{
-	return -EINVAL;
-}
-
-#endif
-
 struct nla_policy rtm_ipv4_policy[RTA_MAX+1] __read_mostly = {
 	[RTA_DST]		= { .type = NLA_U32 },
 	[RTA_SRC]		= { .type = NLA_U32 },