diff --git a/arch/arm/src/lpc17xx/Kconfig b/arch/arm/src/lpc17xx/Kconfig index e4e2dd4aa6..e8ac3d3a22 100644 --- a/arch/arm/src/lpc17xx/Kconfig +++ b/arch/arm/src/lpc17xx/Kconfig @@ -716,7 +716,7 @@ config NET_HASH ---help--- Enable receipt of near-perfect match frames. -config NET_MULTICAST +config LPC17_MULTICAST bool "Multicast" default y if NET_IGMP default n if !NET_IGMP diff --git a/arch/arm/src/lpc17xx/lpc17_ethernet.c b/arch/arm/src/lpc17xx/lpc17_ethernet.c index 993c4296aa..4bc992d2ce 100644 --- a/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -114,8 +114,8 @@ /* If IGMP is enabled, then accept multi-cast frames. */ -#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_NET_MULTICAST) -# define CONFIG_NET_MULTICAST 1 +#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_LPC17_MULTICAST) +# define CONFIG_LPC17_MULTICAST 1 #endif /* If the user did not specify a priority for Ethernet interrupts, set the @@ -1781,7 +1781,7 @@ static int lpc17_ifup(struct net_driver_s *dev) */ regval = ETH_RXFLCTRL_PERFEN | ETH_RXFLCTRL_BCASTEN; -#ifdef CONFIG_NET_MULTICAST +#ifdef CONFIG_LPC17_MULTICAST regval |= (ETH_RXFLCTRL_MCASTEN | ETH_RXFLCTRL_UCASTEN); #endif #ifdef CONFIG_NET_HASH diff --git a/arch/mips/src/pic32mx/Kconfig b/arch/mips/src/pic32mx/Kconfig index 91e544de74..6d8894bf62 100644 --- a/arch/mips/src/pic32mx/Kconfig +++ b/arch/mips/src/pic32mx/Kconfig @@ -1108,7 +1108,7 @@ config NET_HASH ---help--- Enable receipt of near-perfect match frames. -config NET_MULTICAST +config PIC32MX_MULTICAST bool "Multicast" default y if NET_IGMP depends on PIC32MX_ETHERNET diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.c b/arch/mips/src/pic32mx/pic32mx-ethernet.c index 4c9fe79cfa..eae7719bd4 100644 --- a/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -110,8 +110,8 @@ /* If IGMP is enabled, then accept multi-cast frames. */ -#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_NET_MULTICAST) -# define CONFIG_NET_MULTICAST 1 +#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_PIC32MX_MULTICAST) +# define CONFIG_PIC32MX_MULTICAST 1 #endif /* Use defaults if the number of discriptors is not provided */ @@ -2109,7 +2109,7 @@ static int pic32mx_ifup(struct net_driver_s *dev) */ regval = ETH_RXFC_BCEN | ETH_RXFC_UCEN | ETH_RXFC_PMMODE_DISABLED; -#ifdef CONFIG_NET_MULTICAST +#ifdef CONFIG_PIC32MX_MULTICAST regval |= ETH_RXFC_MCEN; #endif pic32mx_putreg(regval, PIC32MX_ETH_RXFC); diff --git a/arch/mips/src/pic32mz/Kconfig b/arch/mips/src/pic32mz/Kconfig index 7a6cc7079f..bca6f2b764 100644 --- a/arch/mips/src/pic32mz/Kconfig +++ b/arch/mips/src/pic32mz/Kconfig @@ -411,7 +411,7 @@ config NET_HASH ---help--- Enable receipt of near-perfect match frames. -config NET_MULTICAST +config PIC32MZ_MULTICAST bool "Multicast" default y if NET_IGMP depends on PIC32MZ_ETHERNET diff --git a/arch/mips/src/pic32mz/pic32mz-ethernet.c b/arch/mips/src/pic32mz/pic32mz-ethernet.c index b2ed4daf9e..6b45f1ea02 100644 --- a/arch/mips/src/pic32mz/pic32mz-ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz-ethernet.c @@ -110,8 +110,8 @@ /* If IGMP is enabled, then accept multi-cast frames. */ -#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_NET_MULTICAST) -# define CONFIG_NET_MULTICAST 1 +#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_PIC32MZ_MULTICAST) +# define CONFIG_PIC32MZ_MULTICAST 1 #endif /* Use defaults if the number of discriptors is not provided */ @@ -2132,7 +2132,7 @@ static int pic32mz_ifup(struct net_driver_s *dev) */ regval = ETH_RXFC_BCEN | ETH_RXFC_UCEN | ETH_RXFC_PMMODE_DISABLED; -#ifdef CONFIG_NET_MULTICAST +#ifdef CONFIG_PIC32MZ_MULTICAST regval |= ETH_RXFC_MCEN; #endif pic32mz_putreg(regval, PIC32MZ_ETH_RXFC);