From d2c83e92357e5a67780b8b9e9c74acaf930ce906 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 29 May 2007 13:06:51 -0700 Subject: [PATCH] --- yaml --- r: 57158 b: refs/heads/master c: ddc31ce311b65fc3c30ec9ca5baf688a882260bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv4/fib_frontend.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 0d3485304808..d09034350ebd 100644 --- 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 index 837f2957fa83..9ad1f6252a97 100644 --- 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 },