IPV4: Remove bogus ifdef mess in arp_process
authorAdrian Bunk <bunk@kernel.org>
Thu, 29 Nov 2007 12:07:57 +0000 (23:07 +1100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 14 Dec 2007 18:31:58 +0000 (10:31 -0800)
commit905bc186cfa30431bd36eeb78f6dd85ff963accb
treef4719b8e3e8473da8fdb31ad5b1f1c319c7629c6
parente8597d874b0141dbfd9aeea4dd84c5a8a614c322
IPV4: Remove bogus ifdef mess in arp_process

[IPV4]: Remove bogus ifdef mess in arp_process

[ Upstream commit: 3660019e5f96fd9a8b7d4214a96523c0bf7b676d ]

The #ifdef's in arp_process() were not only a mess, they were also wrong
in the CONFIG_NET_ETHERNET=n and (CONFIG_NETDEV_1000=y or
CONFIG_NETDEV_10000=y) cases.

Since they are not required this patch removes them.

Also removed are some #ifdef's around #include's that caused compile
errors after this change.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/arp.c