| From 7530475f9b50c2d02b272913fceb43f3c7924a9c Mon Sep 17 00:00:00 2001 |
| From: David S. Miller <davem@davemloft.net> |
| Date: Mon, 10 May 2010 04:59:07 -0700 |
| Subject: net: Fix FDDI and TR config checks in ipv4 arp and LLC. |
| |
| |
| From: David S. Miller <davem@davemloft.net> |
| |
| [ Upstream commit f0ecde1466f21edf577b809735f4f35f354777a0 ] |
| |
| Need to check both CONFIG_FOO and CONFIG_FOO_MODULE |
| |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| net/ipv4/arp.c | 6 +++--- |
| net/llc/llc_sap.c | 2 +- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/net/ipv4/arp.c |
| +++ b/net/ipv4/arp.c |
| @@ -619,13 +619,13 @@ struct sk_buff *arp_create(int type, int |
| #endif |
| #endif |
| |
| -#ifdef CONFIG_FDDI |
| +#if defined(CONFIG_FDDI) || defined(CONFIG_FDDI_MODULE) |
| case ARPHRD_FDDI: |
| arp->ar_hrd = htons(ARPHRD_ETHER); |
| arp->ar_pro = htons(ETH_P_IP); |
| break; |
| #endif |
| -#ifdef CONFIG_TR |
| +#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE) |
| case ARPHRD_IEEE802_TR: |
| arp->ar_hrd = htons(ARPHRD_IEEE802); |
| arp->ar_pro = htons(ETH_P_IP); |
| @@ -1005,7 +1005,7 @@ static int arp_req_set(struct net *net, |
| return -EINVAL; |
| } |
| switch (dev->type) { |
| -#ifdef CONFIG_FDDI |
| +#if defined(CONFIG_FDDI) || defined(CONFIG_FDDI_MODULE) |
| case ARPHRD_FDDI: |
| /* |
| * According to RFC 1390, FDDI devices should accept ARP |
| --- a/net/llc/llc_sap.c |
| +++ b/net/llc/llc_sap.c |
| @@ -30,7 +30,7 @@ static int llc_mac_header_len(unsigned s |
| case ARPHRD_ETHER: |
| case ARPHRD_LOOPBACK: |
| return sizeof(struct ethhdr); |
| -#ifdef CONFIG_TR |
| +#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE) |
| case ARPHRD_IEEE802_TR: |
| return sizeof(struct trh_hdr); |
| #endif |
