| From stable-bounces@linux.kernel.org Thu Nov 29 04:08:37 2007 |
| From: Adrian Bunk <bunk@kernel.org> |
| Date: Thu, 29 Nov 2007 23:07:57 +1100 |
| Subject: IPV4: Remove bogus ifdef mess in arp_process |
| To: stable@kernel.org, bunk@kernel.org, davem@davemloft.net |
| Message-ID: <E1IxiBR-0007s8-00@gondolin.me.apana.org.au> |
| |
| |
| From: Adrian Bunk <bunk@kernel.org> |
| |
| [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 | 19 ------------------- |
| 1 file changed, 19 deletions(-) |
| |
| --- a/net/ipv4/arp.c |
| +++ b/net/ipv4/arp.c |
| @@ -110,12 +110,8 @@ |
| #include <net/tcp.h> |
| #include <net/sock.h> |
| #include <net/arp.h> |
| -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) |
| #include <net/ax25.h> |
| -#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE) |
| #include <net/netrom.h> |
| -#endif |
| -#endif |
| #if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE) |
| #include <net/atmclip.h> |
| struct neigh_table *clip_tbl_hook; |
| @@ -729,20 +725,10 @@ static int arp_process(struct sk_buff *s |
| htons(dev_type) != arp->ar_hrd) |
| goto out; |
| break; |
| -#ifdef CONFIG_NET_ETHERNET |
| case ARPHRD_ETHER: |
| -#endif |
| -#ifdef CONFIG_TR |
| case ARPHRD_IEEE802_TR: |
| -#endif |
| -#ifdef CONFIG_FDDI |
| case ARPHRD_FDDI: |
| -#endif |
| -#ifdef CONFIG_NET_FC |
| case ARPHRD_IEEE802: |
| -#endif |
| -#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_TR) || \ |
| - defined(CONFIG_FDDI) || defined(CONFIG_NET_FC) |
| /* |
| * ETHERNET, Token Ring and Fibre Channel (which are IEEE 802 |
| * devices, according to RFC 2625) devices will accept ARP |
| @@ -757,21 +743,16 @@ static int arp_process(struct sk_buff *s |
| arp->ar_pro != htons(ETH_P_IP)) |
| goto out; |
| break; |
| -#endif |
| -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) |
| case ARPHRD_AX25: |
| if (arp->ar_pro != htons(AX25_P_IP) || |
| arp->ar_hrd != htons(ARPHRD_AX25)) |
| goto out; |
| break; |
| -#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE) |
| case ARPHRD_NETROM: |
| if (arp->ar_pro != htons(AX25_P_IP) || |
| arp->ar_hrd != htons(ARPHRD_NETROM)) |
| goto out; |
| break; |
| -#endif |
| -#endif |
| } |
| |
| /* Understand only these message types */ |
