projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f282d45
)
[IPV4]: Kill references to bogus non-existent CONFIG_IP_NOSIOCRT
author
David S. Miller
<davem@sunset.davemloft.net>
Tue, 29 May 2007 20:06:51 +0000
(13:06 -0700)
committer
David S. Miller
<davem@sunset.davemloft.net>
Thu, 31 May 2007 08:23:29 +0000
(
01:23
-0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_frontend.c
patch
|
blob
|
history
diff --git
a/net/ipv4/fib_frontend.c
b/net/ipv4/fib_frontend.c
index
837f295
..
9ad1f62
100644
(file)
--- a/
net/ipv4/fib_frontend.c
+++ b/
net/ipv4/fib_frontend.c
@@
-250,8
+250,6
@@
e_inval:
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 },