Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-26 10:46:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add new configuratin CONFIG_NET_MCASTGROUP. This option is selected automatically if either CONFIG_NET_IGMP or CONFIG_NET_MLD are selected. Most conditional logic based on CONFIG_NET_IGMP replaced with conditioning on CONFIG_NET_MCASTGROUP.

Browse Source
This commit is contained in:
Gregory Nutt
2018-10-31 15:03:51 -06:00
parent dde1e89b8c
commit 6d93658ff8
56 changed files with 239 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/c5471/c5471_ethernet.c
+4 -4
View File
@@ -420,7 +420,7 @@ static int c5471_ifdown(struct net_driver_s *dev);
static void c5471_txavail_work(FAR void *arg);
static int c5471_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -2031,7 +2031,7 @@ static int c5471_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)dev->d_private;
@@ -2061,7 +2061,7 @@ static int c5471_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int c5471_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct c5471_driver_s *priv = (FAR struct c5471_driver_s *)dev->d_private;
@@ -2444,7 +2444,7 @@ void up_netinitialize(void)
g_c5471[0].c_dev.d_ifup = c5471_ifup; /* I/F down callback */
g_c5471[0].c_dev.d_ifdown = c5471_ifdown; /* I/F up (new IP address) callback */
g_c5471[0].c_dev.d_txavail = c5471_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
g_c5471[0].c_dev.d_addmac = c5471_addmac; /* Add multicast MAC address */
g_c5471[0].c_dev.d_rmmac = c5471_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/imxrt/imxrt_enet.c
+9 -9
View File
@@ -340,7 +340,7 @@ static int imxrt_txavail(struct net_driver_s *dev);
static int imxrt_ifup_action(struct net_driver_s *dev, bool resetphy);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int imxrt_addmac(struct net_driver_s *dev,
FAR const uint8_t *mac);
static int imxrt_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
@@ -976,7 +976,7 @@ static void imxrt_enet_interrupt_work(FAR void *arg)
{
FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg;
uint32_t pending;
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
uint32_t gaurStore;
uint32_t galrStore;
#endif
@@ -1013,7 +1013,7 @@ static void imxrt_enet_interrupt_work(FAR void *arg)
* reset/renegotiate the phy.
*/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
/* Just before we pull the rug lets make sure we retain the
* multicast hash table.
*/
@@ -1025,7 +1025,7 @@ static void imxrt_enet_interrupt_work(FAR void *arg)
(void)imxrt_ifdown(&priv->dev);
(void)imxrt_ifup_action(&priv->dev, false);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
/* Now write the multicast table back */
putreg32(gaurStore, IMXRT_ENET_GAUR);
@@ -1556,7 +1556,7 @@ static int imxrt_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static uint32_t imxrt_calcethcrc(const uint8_t *data, size_t length)
{
uint32_t crc = 0xFFFFFFFFU;
@@ -1605,7 +1605,7 @@ static uint32_t imxrt_calcethcrc(const uint8_t *data, size_t length)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static uint32_t imxrt_enet_hash_index(const uint8_t *mac)
{
uint32_t crc;
@@ -1639,7 +1639,7 @@ static uint32_t imxrt_enet_hash_index(const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int imxrt_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -1687,7 +1687,7 @@ static int imxrt_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int imxrt_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -2512,7 +2512,7 @@ int imxrt_netinitialize(int intf)
priv->dev.d_ifup = imxrt_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = imxrt_ifdown; /* I/F down callback */
priv->dev.d_txavail = imxrt_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = imxrt_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = imxrt_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/kinetis/kinetis_enet.c
+4 -4
View File
@@ -306,7 +306,7 @@ static int kinetis_ifdown(struct net_driver_s *dev);
static void kinetis_txavail_work(FAR void *arg);
static int kinetis_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int kinetis_addmac(struct net_driver_s *dev,
FAR const uint8_t *mac);
static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
@@ -1393,7 +1393,7 @@ static int kinetis_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct kinetis_driver_s *priv =
@@ -1423,7 +1423,7 @@ static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct kinetis_driver_s *priv =
@@ -2123,7 +2123,7 @@ int kinetis_netinitialize(int intf)
priv->dev.d_ifup = kinetis_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = kinetis_ifdown; /* I/F down callback */
priv->dev.d_txavail = kinetis_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = kinetis_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = kinetis_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/lpc17xx/Kconfig
+3 -3
View File
@@ -718,11 +718,11 @@ config LPC17_ETH_HASH
config LPC17_MULTICAST
bool "Multicast"
default y if NET_IGMP
default n if !NET_IGMP
default y if NET_MCASTGROUP
default n if !NET_MCASTGROUP
---help---
Enable receipt of multicast (and unicast) frames. Automatically set
if NET_IGMP is selected.
if NET_MCASTGROUP is selected.
choice
prompt "Work queue"
arch/arm/src/lpc17xx/lpc17_ethernet.c
+9 -9
View File
@@ -122,7 +122,7 @@
/* If IGMP is enabled, then accept multi-cast frames. */
#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_LPC17_MULTICAST)
#if defined(CONFIG_NET_MCASTGROUP) && !defined(CONFIG_LPC17_MULTICAST)
# define CONFIG_LPC17_MULTICAST 1
#endif
@@ -356,11 +356,11 @@ static int lpc17_ifdown(struct net_driver_s *dev);
static void lpc17_txavail_work(FAR void *arg);
static int lpc17_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t lpc17_calcethcrc(const uint8_t *data, size_t length);
static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -1875,7 +1875,7 @@ static int lpc17_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t lpc17_calcethcrc(const uint8_t *data, size_t length)
{
char byte;
@@ -1936,7 +1936,7 @@ static uint32_t lpc17_calcethcrc(const uint8_t *data, size_t length)
return crc;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: lpc17_addmac
@@ -1956,7 +1956,7 @@ static uint32_t lpc17_calcethcrc(const uint8_t *data, size_t length)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
uintptr_t regaddr;
@@ -2011,7 +2011,7 @@ static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac)
return OK;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: lpc17_rmmac
@@ -2031,7 +2031,7 @@ static int lpc17_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc17_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
uintptr_t regaddr1;
@@ -3047,7 +3047,7 @@ static inline int lpc17_ethinitialize(int intf)
priv->lp_dev.d_ifup = lpc17_ifup; /* I/F down callback */
priv->lp_dev.d_ifdown = lpc17_ifdown; /* I/F up (new IP address) callback */
priv->lp_dev.d_txavail = lpc17_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->lp_dev.d_addmac = lpc17_addmac; /* Add multicast MAC address */
priv->lp_dev.d_rmmac = lpc17_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/lpc43xx/lpc43_ethernet.c
+6 -6
View File
@@ -615,10 +615,10 @@ static int lpc43_ifdown(struct net_driver_s *dev);
static void lpc43_txavail_work(FAR void *arg);
static int lpc43_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NETDEV_IOCTL
@@ -2410,7 +2410,7 @@ static int lpc43_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t lpc43_calcethcrc(const uint8_t *data, size_t length)
{
uint32_t crc = 0xffffffff;
@@ -2455,7 +2455,7 @@ static uint32_t lpc43_calcethcrc(const uint8_t *data, size_t length)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -2512,7 +2512,7 @@ static int lpc43_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc43_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -3824,7 +3824,7 @@ static inline int lpc43_ethinitialize(void)
priv->dev.d_ifup = lpc43_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = lpc43_ifdown; /* I/F down callback */
priv->dev.d_txavail = lpc43_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = lpc43_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = lpc43_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/lpc54xx/lpc54_ethernet.c
+5 -5
View File
@@ -117,7 +117,7 @@
#undef LPC54_ACCEPT_ALLMULTICAST
#if defined(CONFIG_LPC54_ETH_RX_ALLMULTICAST) || \
defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
# define LPC54_ACCEPT_ALLMULTICAST 1
#endif
@@ -414,7 +414,7 @@ static int lpc54_eth_ifdown(struct net_driver_s *dev);
static void lpc54_eth_txavail_work(void *arg);
static int lpc54_eth_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc54_eth_addmac(struct net_driver_s *dev,
const uint8_t *mac);
static int lpc54_eth_rmmac(struct net_driver_s *dev,
@@ -2332,7 +2332,7 @@ static int lpc54_eth_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc54_eth_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
/* Unlike other Ethernet hardware, the LPC54xx does not seem to support
@@ -2360,7 +2360,7 @@ static int lpc54_eth_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lpc54_eth_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
/* Unlike other Ethernet hardware, the LPC54xx does not seem to support
@@ -3054,7 +3054,7 @@ int up_netinitialize(int intf)
priv->eth_dev.d_ifup = lpc54_eth_ifup; /* I/F up (new IP address) callback */
priv->eth_dev.d_ifdown = lpc54_eth_ifdown; /* I/F down callback */
priv->eth_dev.d_txavail = lpc54_eth_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->eth_dev.d_addmac = lpc54_eth_addmac; /* Add multicast MAC address */
priv->eth_dev.d_rmmac = lpc54_eth_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/sam34/sam_emac.c
+8 -8
View File
@@ -400,11 +400,11 @@ static int sam_ifdown(struct net_driver_s *dev);
static void sam_txavail_work(FAR void *arg);
static int sam_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac);
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2022,7 +2022,7 @@ static int sam_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac)
{
unsigned int ndx;
@@ -2120,7 +2120,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
return ndx & 0x3f;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_addmac
@@ -2140,7 +2140,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -2193,7 +2193,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
return OK;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_rmmac
@@ -2213,7 +2213,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -3633,7 +3633,7 @@ void up_netinitialize(void)
priv->dev.d_ifup = sam_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = sam_ifdown; /* I/F down callback */
priv->dev.d_txavail = sam_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = sam_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = sam_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/sama5/sam_emaca.c
+8 -8
View File
@@ -405,11 +405,11 @@ static int sam_ifdown(struct net_driver_s *dev);
static void sam_txavail_work(FAR void *arg);
static int sam_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac);
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2058,7 +2058,7 @@ static int sam_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac)
{
unsigned int ndx;
@@ -2156,7 +2156,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
return ndx & 0x3f;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_addmac
@@ -2176,7 +2176,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -2229,7 +2229,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
return OK;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_rmmac
@@ -2249,7 +2249,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -3675,7 +3675,7 @@ int sam_emac_initialize(void)
priv->dev.d_ifup = sam_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = sam_ifdown; /* I/F down callback */
priv->dev.d_txavail = sam_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = sam_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = sam_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/sama5/sam_emacb.c
+7 -7
View File
@@ -499,11 +499,11 @@ static int sam_ifdown(struct net_driver_s *dev);
static void sam_txavail_work(FAR void *arg);
static int sam_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac);
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2427,7 +2427,7 @@ static int sam_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac)
{
unsigned int ndx;
@@ -2525,7 +2525,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
return ndx & 0x3f;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_addmac
@@ -2545,7 +2545,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -2617,7 +2617,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -4360,7 +4360,7 @@ int sam_emac_initialize(int intf)
priv->dev.d_ifup = sam_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = sam_ifdown; /* I/F down callback */
priv->dev.d_txavail = sam_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = sam_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = sam_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/sama5/sam_gmac.c
+7 -7
View File
@@ -330,11 +330,11 @@ static int sam_ifdown(struct net_driver_s *dev);
static void sam_txavail_work(FAR void *arg);
static int sam_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac);
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2013,7 +2013,7 @@ static int sam_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac)
{
unsigned int ndx;
@@ -2111,7 +2111,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
return ndx & 0x3f;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_addmac
@@ -2131,7 +2131,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
@@ -2204,7 +2204,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_gmac_s *priv = (struct sam_gmac_s *)dev->d_private;
@@ -3747,7 +3747,7 @@ int sam_gmac_initialize(void)
priv->dev.d_ifup = sam_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = sam_ifdown; /* I/F down callback */
priv->dev.d_txavail = sam_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = sam_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = sam_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/samv7/sam_emac.c
+7 -7
View File
@@ -614,11 +614,11 @@ static int sam_ifdown(struct net_driver_s *dev);
static void sam_txavail_work(FAR void *arg);
static int sam_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac);
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2911,7 +2911,7 @@ static int sam_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static unsigned int sam_hashindx(const uint8_t *mac)
{
unsigned int ndx;
@@ -3009,7 +3009,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
return ndx & 0x3f;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: sam_addmac
@@ -3029,7 +3029,7 @@ static unsigned int sam_hashindx(const uint8_t *mac)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -3101,7 +3101,7 @@ static int sam_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int sam_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct sam_emac_s *priv = (struct sam_emac_s *)dev->d_private;
@@ -5020,7 +5020,7 @@ int sam_emac_initialize(int intf)
priv->dev.d_ifup = sam_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = sam_ifdown; /* I/F down callback */
priv->dev.d_txavail = sam_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = sam_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = sam_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/stm32/stm32_eth.c
+7 -7
View File
@@ -716,10 +716,10 @@ static int stm32_ifdown(struct net_driver_s *dev);
static void stm32_txavail_work(FAR void *arg);
static int stm32_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NETDEV_IOCTL
@@ -2522,7 +2522,7 @@ static int stm32_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length)
{
uint32_t crc = 0xffffffff;
@@ -2567,7 +2567,7 @@ static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -2604,7 +2604,7 @@ static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
return OK;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: stm32_rmmac
@@ -2624,7 +2624,7 @@ static int stm32_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int stm32_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -4044,7 +4044,7 @@ int stm32_ethinitialize(int intf)
priv->dev.d_ifup = stm32_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = stm32_ifdown; /* I/F down callback */
priv->dev.d_txavail = stm32_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = stm32_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = stm32_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/stm32f7/stm32_ethernet.c
+7 -7
View File
@@ -726,10 +726,10 @@ static int stm32_ifdown(struct net_driver_s *dev);
static void stm32_txavail_work(void *arg);
static int stm32_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int stm32_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
#ifdef CONFIG_NETDEV_IOCTL
@@ -2603,7 +2603,7 @@ static int stm32_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length)
{
uint32_t crc = 0xffffffff;
@@ -2648,7 +2648,7 @@ static uint32_t stm32_calcethcrc(const uint8_t *data, size_t length)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
uint32_t crc;
@@ -2685,7 +2685,7 @@ static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac)
return OK;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: stm32_rmmac
@@ -2705,7 +2705,7 @@ static int stm32_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int stm32_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
uint32_t crc;
@@ -4096,7 +4096,7 @@ int stm32_ethinitialize(int intf)
priv->dev.d_ifup = stm32_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = stm32_ifdown; /* I/F down callback */
priv->dev.d_txavail = stm32_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = stm32_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = stm32_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/tiva/lm3s_ethernet.c
+4 -4
View File
@@ -270,7 +270,7 @@ static int tiva_ifdown(struct net_driver_s *dev);
static void tiva_txavail_work(void *arg);
static int tiva_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tiva_addmac(struct net_driver_s *dev, const uint8_t *mac);
static int tiva_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -1593,7 +1593,7 @@ static int tiva_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tiva_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
@@ -1623,7 +1623,7 @@ static int tiva_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tiva_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct tiva_driver_s *priv = (struct tiva_driver_s *)dev->d_private;
@@ -1683,7 +1683,7 @@ static inline int tiva_ethinitialize(int intf)
priv->ld_dev.d_ifup = tiva_ifup; /* I/F down callback */
priv->ld_dev.d_ifdown = tiva_ifdown; /* I/F up (new IP address) callback */
priv->ld_dev.d_txavail = tiva_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->ld_dev.d_addmac = tiva_addmac; /* Add multicast MAC address */
priv->ld_dev.d_rmmac = tiva_rmmac; /* Remove multicast MAC address */
#endif
arch/arm/src/tiva/tm4c_ethernet.c
+7 -7
View File
@@ -727,10 +727,10 @@ static int tiva_ifdown(struct net_driver_s *dev);
static void tiva_txavail_work(FAR void *arg);
static int tiva_txavail(struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NETDEV_IOCTL
@@ -2526,7 +2526,7 @@ static int tiva_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t tiva_calcethcrc(const uint8_t *data, size_t length)
{
uint32_t crc = 0xffffffff;
@@ -2551,7 +2551,7 @@ static uint32_t tiva_calcethcrc(const uint8_t *data, size_t length)
return ~crc;
}
#endif /* CONFIG_NET_IGMP || CONFIG_NET_ICMPv6 */
#endif /* CONFIG_NET_MCASTGROUP || CONFIG_NET_ICMPv6 */
/****************************************************************************
* Function: tiva_addmac
@@ -2571,7 +2571,7 @@ static uint32_t tiva_calcethcrc(const uint8_t *data, size_t length)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -2628,7 +2628,7 @@ static int tiva_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tiva_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
uint32_t crc;
@@ -4041,7 +4041,7 @@ int tiva_ethinitialize(int intf)
priv->dev.d_ifup = tiva_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = tiva_ifdown; /* I/F down callback */
priv->dev.d_txavail = tiva_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = tiva_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = tiva_rmmac; /* Remove multicast MAC address */
#endif
arch/hc/src/m9s12/m9s12_ethernet.c
+4 -4
View File
@@ -139,7 +139,7 @@ static void emac_txtimeout(int argc, uint32_t arg, ...);
static int emac_ifup(struct net_driver_s *dev);
static int emac_ifdown(struct net_driver_s *dev);
static int emac_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -681,7 +681,7 @@ static int emac_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
@@ -710,7 +710,7 @@ static int emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)dev->d_private;
@@ -769,7 +769,7 @@ int emac_initialize(int intf)
priv->d_dev.d_ifup = emac_ifup; /* I/F down callback */
priv->d_dev.d_ifdown = emac_ifdown; /* I/F up (new IP address) callback */
priv->d_dev.d_txavail = emac_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->d_dev.d_addmac = emac_addmac; /* Add multicast MAC address */
priv->d_dev.d_rmmac = emac_rmmac; /* Remove multicast MAC address */
#endif
arch/mips/src/pic32mx/Kconfig
+2 -2
View File
@@ -1089,11 +1089,11 @@ config PIC32MX_ETH_PRIORITY
config PIC32MX_MULTICAST
bool "Multicast"
default y if NET_IGMP
default y if NET_MCASTGROUP
depends on PIC32MX_ETHERNET
---help---
Enable receipt of multicast (and unicast) frames. Automatically set if
NET_IGMP is selected.
NET_MCASTGROUP is selected.
choice
prompt "Work queue"
arch/mips/src/pic32mx/pic32mx-ethernet.c
+5 -5
View File
@@ -124,7 +124,7 @@
/* If IGMP is enabled, then accept multi-cast frames. */
#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_PIC32MX_MULTICAST)
#if defined(CONFIG_NET_MCASTGROUP) && !defined(CONFIG_PIC32MX_MULTICAST)
# define CONFIG_PIC32MX_MULTICAST 1
#endif
@@ -414,7 +414,7 @@ static int pic32mx_ifdown(struct net_driver_s *dev);
static void pic32mx_txavail_work(void *arg);
static int pic32mx_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac);
static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2497,7 +2497,7 @@ static int pic32mx_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
@@ -2527,7 +2527,7 @@ static int pic32mx_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int pic32mx_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct pic32mx_driver_s *priv = (struct pic32mx_driver_s *)dev->d_private;
@@ -3338,7 +3338,7 @@ static inline int pic32mx_ethinitialize(int intf)
priv->pd_dev.d_ifup = pic32mx_ifup; /* I/F down callback */
priv->pd_dev.d_ifdown = pic32mx_ifdown; /* I/F up (new IP address) callback */
priv->pd_dev.d_txavail = pic32mx_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->pd_dev.d_addmac = pic32mx_addmac; /* Add multicast MAC address */
priv->pd_dev.d_rmmac = pic32mx_rmmac; /* Remove multicast MAC address */
#endif
arch/mips/src/pic32mz/Kconfig
+2 -2
View File
@@ -416,11 +416,11 @@ config PIC32MZ_ETH_PRIORITY
config PIC32MZ_MULTICAST
bool "Multicast"
default y if NET_IGMP
default y if NET_MCASTGROUP
depends on PIC32MZ_ETHERNET
---help---
Enable receipt of multicast (and unicast) frames. Automatically set if
NET_IGMP is selected.
NET_MCASTGROUP is selected.
choice
prompt "Work queue"
arch/mips/src/pic32mz/pic32mz-ethernet.c
+5 -5
View File
@@ -124,7 +124,7 @@
/* If IGMP is enabled, then accept multi-cast frames. */
#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_PIC32MZ_MULTICAST)
#if defined(CONFIG_NET_MCASTGROUP) && !defined(CONFIG_PIC32MZ_MULTICAST)
# define CONFIG_PIC32MZ_MULTICAST 1
#endif
@@ -441,7 +441,7 @@ static int pic32mz_ifdown(struct net_driver_s *dev);
static void pic32mz_txavail_work(void *arg);
static int pic32mz_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int pic32mz_addmac(struct net_driver_s *dev, const uint8_t *mac);
static int pic32mz_rmmac(struct net_driver_s *dev, const uint8_t *mac);
#endif
@@ -2530,7 +2530,7 @@ static int pic32mz_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int pic32mz_addmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct pic32mz_driver_s *priv = (struct pic32mz_driver_s *)dev->d_private;
@@ -2560,7 +2560,7 @@ static int pic32mz_addmac(struct net_driver_s *dev, const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int pic32mz_rmmac(struct net_driver_s *dev, const uint8_t *mac)
{
struct pic32mz_driver_s *priv = (struct pic32mz_driver_s *)dev->d_private;
@@ -3374,7 +3374,7 @@ static inline int pic32mz_ethinitialize(int intf)
priv->pd_dev.d_ifup = pic32mz_ifup; /* I/F down callback */
priv->pd_dev.d_ifdown = pic32mz_ifdown; /* I/F up (new IP address) callback */
priv->pd_dev.d_txavail = pic32mz_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->pd_dev.d_addmac = pic32mz_addmac; /* Add multicast MAC address */
priv->pd_dev.d_rmmac = pic32mz_rmmac; /* Remove multicast MAC address */
#endif
arch/misoc/src/common/misoc_net.c
+5 -5
View File
@@ -180,9 +180,9 @@ static int misoc_net_ifdown(FAR struct net_driver_s *dev);
static void misoc_net_txavail_work(FAR void *arg);
static int misoc_net_txavail(FAR struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int misoc_net_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int misoc_net_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NET_ICMPv6
@@ -996,7 +996,7 @@ static int misoc_net_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int misoc_net_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)dev->d_private;
@@ -1025,7 +1025,7 @@ static int misoc_net_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int misoc_net_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct misoc_net_driver_s *priv = (FAR struct misoc_net_driver_s *)dev->d_private;
@@ -1169,7 +1169,7 @@ int misoc_net_initialize(int intf)
priv->misoc_net_dev.d_ifup = misoc_net_ifup; /* I/F up (new IP address) callback */
priv->misoc_net_dev.d_ifdown = misoc_net_ifdown; /* I/F down callback */
priv->misoc_net_dev.d_txavail = misoc_net_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->misoc_net_dev.d_addmac = misoc_net_addmac; /* Add multicast MAC address */
priv->misoc_net_dev.d_rmmac = misoc_net_rmmac; /* Remove multicast MAC address */
#endif
arch/z80/src/ez80/ez80_emac.c
+4 -4
View File
@@ -424,7 +424,7 @@ static int ez80emac_ifdown(struct net_driver_s *dev);
static void ez80emac_txavail_work(FAR void *arg);
static int ez80emac_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int ez80emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -2216,7 +2216,7 @@ static int ez80emac_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private;
@@ -2246,7 +2246,7 @@ static int ez80emac_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int ez80emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct ez80emac_driver_s *priv = (FAR struct ez80emac_driver_s *)dev->d_private;
@@ -2534,7 +2534,7 @@ int up_netinitialize(void)
priv->dev.d_ifup = ez80emac_ifup; /* I/F down callback */
priv->dev.d_ifdown = ez80emac_ifdown; /* I/F up (new IP address) callback */
priv->dev.d_txavail = ez80emac_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = ez80emac_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = ez80emac_rmmac; /* Remove multicast MAC address */
#endif
configs/lincoln60/README.txt
+1 -1
View File
@@ -195,7 +195,7 @@ Lincoln 60 Configuration Options
Also needs CONFIG_DEBUG_FEATURES.
CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
LPC17xx USB Device Configuration
configs/lpcxpresso-lpc1768/README.txt
+1 -1
View File
@@ -513,7 +513,7 @@ LPCXpresso Configuration Options
Also needs CONFIG_DEBUG_FEATURES.
CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
LPC17xx USB Device Configuration
configs/mbed/README.txt
+1 -1
View File
@@ -158,7 +158,7 @@ mbed Configuration Options
Also needs CONFIG_DEBUG_FEATURES.
CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
LPC17xx USB Device Configuration
configs/mcb1700/README.txt
+1 -1
View File
@@ -159,7 +159,7 @@ mcb1700 Configuration Options
Also needs CONFIG_DEBUG_FEATURES.
CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
LPC17xx USB Device Configuration
configs/olimex-lpc1766stk/README.txt
+1 -1
View File
@@ -596,7 +596,7 @@ Olimex LPC1766-STK Configuration Options
Also needs CONFIG_DEBUG_FEATURES.
CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
LPC17xx USB Device Configuration
configs/pic32mx-starterkit/README.txt
+1 -1
View File
@@ -983,7 +983,7 @@ PIC32MX specific PHY/Ethernet device driver settings
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
CONFIG_DEBUG_FEATURES.
CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
Related DEVCFG3 Configuration Settings:
CONFIG_PIC32MX_FETHIO: Ethernet I/O Pin Selection bit:
configs/pic32mx7mmb/README.txt
+1 -1
View File
@@ -565,7 +565,7 @@ PIC32MX specific PHY/Ethernet device driver settings
CONFIG_NET_REGDEBUG - Enabled low level register debug. Also needs
CONFIG_DEBUG_FEATURES.
CONFIG_PIC32MX_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
Related DEVCFG3 Configuration Settings:
CONFIG_PIC32MX_FETHIO: Ethernet I/O Pin Selection bit:
configs/zkit-arm-1769/README.txt
+1 -1
View File
@@ -324,7 +324,7 @@ ZKit-ARM Configuration Options
Also needs CONFIG_DEBUG_FEATURES.
CONFIG_LPC17_ETH_HASH - Enable receipt of near-perfect match frames.
CONFIG_LPC17_MULTICAST - Enable receipt of multicast (and unicast) frames.
Automatically set if CONFIG_NET_IGMP is selected.
Automatically set if CONFIG_NET_MCASTGROUP is selected.
LPC17xx USB Device Configuration
drivers/net/dm90x0.c
+4 -4
View File
@@ -404,7 +404,7 @@ static int dm9x_ifdown(struct net_driver_s *dev);
static void dm9x_txavail_work(FAR void *arg);
static int dm9x_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int dm9x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int dm9x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -1693,7 +1693,7 @@ static int dm9x_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int dm9x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct dm9x_driver_s *priv = (FAR struct dm9x_driver_s *)dev->d_private;
@@ -1723,7 +1723,7 @@ static int dm9x_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int dm9x_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct dm9x_driver_s *priv = (FAR struct dm9x_driver_s *)dev->d_private;
@@ -1945,7 +1945,7 @@ int dm9x_initialize(void)
g_dm9x[0].dm_dev.d_ifup = dm9x_ifup; /* I/F down callback */
g_dm9x[0].dm_dev.d_ifdown = dm9x_ifdown; /* I/F up (new IP address) callback */
g_dm9x[0].dm_dev.d_txavail = dm9x_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
g_dm9x[0].dm_dev.d_addmac = dm9x_addmac; /* Add multicast MAC address */
g_dm9x[0].dm_dev.d_rmmac = dm9x_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/enc28j60.c
+4 -4
View File
@@ -341,7 +341,7 @@ static void enc_polltimer(int argc, uint32_t arg, ...);
static int enc_ifup(struct net_driver_s *dev);
static int enc_ifdown(struct net_driver_s *dev);
static int enc_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -2246,7 +2246,7 @@ static int enc_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -2284,7 +2284,7 @@ static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -2630,7 +2630,7 @@ int enc_initialize(FAR struct spi_dev_s *spi,
priv->dev.d_ifup = enc_ifup; /* I/F down callback */
priv->dev.d_ifdown = enc_ifdown; /* I/F up (new IP address) callback */
priv->dev.d_txavail = enc_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = enc_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = enc_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/encx24j600.c
+4 -4
View File
@@ -356,7 +356,7 @@ static void enc_polltimer(int argc, uint32_t arg, ...);
static int enc_ifup(struct net_driver_s *dev);
static int enc_ifdown(struct net_driver_s *dev);
static int enc_txavail(struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -2395,7 +2395,7 @@ static int enc_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -2433,7 +2433,7 @@ static int enc_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int enc_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)dev->d_private;
@@ -2812,7 +2812,7 @@ int enc_initialize(FAR struct spi_dev_s *spi,
priv->dev.d_ifup = enc_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = enc_ifdown; /* I/F down callback */
priv->dev.d_txavail = enc_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = enc_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = enc_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/ftmac100.c
+6 -6
View File
@@ -114,7 +114,7 @@
#define ETH_ZLEN 60
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
# define MACCR_ENABLE_ALL (FTMAC100_MACCR_XMT_EN | \
FTMAC100_MACCR_RCV_EN | \
FTMAC100_MACCR_XDMA_EN | \
@@ -229,9 +229,9 @@ static int ftmac100_ifdown(FAR struct net_driver_s *dev);
static void ftmac100_txavail_work(FAR void *arg);
static int ftmac100_txavail(FAR struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int ftmac100_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int ftmac100_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
#ifdef CONFIG_NET_ICMPv6
@@ -1351,7 +1351,7 @@ static int ftmac100_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int ftmac100_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct ftmac100_driver_s *priv = (FAR struct ftmac100_driver_s *)dev->d_private;
@@ -1405,7 +1405,7 @@ static int ftmac100_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int ftmac100_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct ftmac100_driver_s *priv = (FAR struct ftmac100_driver_s *)dev->d_private;
@@ -1551,7 +1551,7 @@ int ftmac100_initialize(int intf)
priv->ft_dev.d_ifup = ftmac100_ifup; /* I/F up (new IP address) callback */
priv->ft_dev.d_ifdown = ftmac100_ifdown; /* I/F down callback */
priv->ft_dev.d_txavail = ftmac100_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->ft_dev.d_addmac = ftmac100_addmac; /* Add multicast MAC address */
priv->ft_dev.d_rmmac = ftmac100_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/lan91c111.c
+5 -5
View File
@@ -145,10 +145,10 @@ static int lan91c111_ifdown(FAR struct net_driver_s *dev);
static void lan91c111_txavail_work(FAR void *arg);
static int lan91c111_txavail(FAR struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int lan91c111_addmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lan91c111_rmmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#endif
@@ -1312,7 +1312,7 @@ static int lan91c111_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static uint32_t lan91c111_crc32(FAR const uint8_t *src, size_t len)
{
uint32_t crc = 0xffffffff;
@@ -1386,7 +1386,7 @@ static int lan91c111_addmac(FAR struct net_driver_s *dev,
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lan91c111_rmmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac)
{
@@ -1614,7 +1614,7 @@ int lan91c111_initialize(uintptr_t base, int irq)
dev->d_ifup = lan91c111_ifup; /* I/F up (new IP address) callback */
dev->d_ifdown = lan91c111_ifdown; /* I/F down callback */
dev->d_txavail = lan91c111_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
dev->d_addmac = lan91c111_addmac; /* Add multicast MAC address */
dev->d_rmmac = lan91c111_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/loopback.c
+4 -4
View File
@@ -126,7 +126,7 @@ static int lo_ifup(FAR struct net_driver_s *dev);
static int lo_ifdown(FAR struct net_driver_s *dev);
static void lo_txavail_work(FAR void *arg);
static int lo_txavail(FAR struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lo_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
static int lo_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -446,7 +446,7 @@ static int lo_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lo_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
/* There is no multicast support in the loopback driver */
@@ -473,7 +473,7 @@ static int lo_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int lo_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
/* There is no multicast support in the loopback driver */
@@ -514,7 +514,7 @@ int localhost_initialize(void)
priv->lo_dev.d_ifup = lo_ifup; /* I/F up (new IP address) callback */
priv->lo_dev.d_ifdown = lo_ifdown; /* I/F down callback */
priv->lo_dev.d_txavail = lo_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->lo_dev.d_addmac = lo_addmac; /* Add multicast MAC address */
priv->lo_dev.d_rmmac = lo_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/skeleton.c
+5 -5
View File
@@ -184,10 +184,10 @@ static int skel_ifdown(FAR struct net_driver_s *dev);
static void skel_txavail_work(FAR void *arg);
static int skel_txavail(FAR struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int skel_addmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int skel_rmmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#endif
@@ -973,7 +973,7 @@ static int skel_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int skel_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct skel_driver_s *priv = (FAR struct skel_driver_s *)dev->d_private;
@@ -1000,7 +1000,7 @@ static int skel_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int skel_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct skel_driver_s *priv = (FAR struct skel_driver_s *)dev->d_private;
@@ -1173,7 +1173,7 @@ int skel_initialize(int intf)
priv->sk_dev.d_ifup = skel_ifup; /* I/F up (new IP address) callback */
priv->sk_dev.d_ifdown = skel_ifdown; /* I/F down callback */
priv->sk_dev.d_txavail = skel_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->sk_dev.d_addmac = skel_addmac; /* Add multicast MAC address */
priv->sk_dev.d_rmmac = skel_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/slip.c
+4 -4
View File
@@ -184,7 +184,7 @@ static int slip_rxtask(int argc, FAR char *argv[]);
static int slip_ifup(FAR struct net_driver_s *dev);
static int slip_ifdown(FAR struct net_driver_s *dev);
static int slip_txavail(FAR struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int slip_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
static int slip_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -866,7 +866,7 @@ static int slip_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int slip_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -895,7 +895,7 @@ static int slip_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int slip_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct slip_driver_s *priv = (FAR struct slip_driver_s *)dev->d_private;
@@ -948,7 +948,7 @@ int slip_initialize(int intf, FAR const char *devname)
priv->dev.d_ifup = slip_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = slip_ifdown; /* I/F down callback */
priv->dev.d_txavail = slip_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = slip_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = slip_rmmac; /* Remove multicast MAC address */
#endif
drivers/net/tun.c
+4 -4
View File
@@ -188,7 +188,7 @@ static void tun_poll_expiry(int argc, wdparm_t arg, ...);
static int tun_ifup(FAR struct net_driver_s *dev);
static int tun_ifdown(FAR struct net_driver_s *dev);
static int tun_txavail(FAR struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tun_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
static int tun_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
@@ -1117,7 +1117,7 @@ static int tun_txavail(struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tun_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
/* Add the MAC address to the hardware multicast routing table */
@@ -1144,7 +1144,7 @@ static int tun_addmac(struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int tun_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
{
/* Add the MAC address to the hardware multicast routing table */
@@ -1201,7 +1201,7 @@ static int tun_dev_init(FAR struct tun_device_s *priv, FAR struct file *filep,
priv->dev.d_ifup = tun_ifup; /* I/F up (new IP address) callback */
priv->dev.d_ifdown = tun_ifdown; /* I/F down callback */
priv->dev.d_txavail = tun_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->dev.d_addmac = tun_addmac; /* Add multicast MAC address */
priv->dev.d_rmmac = tun_rmmac; /* Remove multicast MAC address */
#endif
drivers/usbdev/cdcecm.c
+5 -5
View File
@@ -201,10 +201,10 @@ static int cdcecm_ifdown(FAR struct net_driver_s *dev);
static void cdcecm_txavail_work(FAR void *arg);
static int cdcecm_txavail(FAR struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int cdcecm_addmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int cdcecm_rmmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#endif
@@ -929,7 +929,7 @@ static int cdcecm_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int cdcecm_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct cdcecm_driver_s *priv =
@@ -958,7 +958,7 @@ static int cdcecm_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int cdcecm_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct cdcecm_driver_s *priv =
@@ -2101,7 +2101,7 @@ static int cdcecm_classobject(int minor, FAR struct usbdev_devinfo_s *devinfo,
self->dev.d_ifup = cdcecm_ifup; /* I/F up (new IP address) callback */
self->dev.d_ifdown = cdcecm_ifdown; /* I/F down callback */
self->dev.d_txavail = cdcecm_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
self->dev.d_addmac = cdcecm_addmac; /* Add multicast MAC address */
self->dev.d_rmmac = cdcecm_rmmac; /* Remove multicast MAC address */
#endif
drivers/wireless/ieee80211/bcmf_netdev.c
+5 -5
View File
@@ -135,10 +135,10 @@ static int bcmf_ifdown(FAR struct net_driver_s *dev);
static void bcmf_txavail_work(FAR void *arg);
static int bcmf_txavail(FAR struct net_driver_s *dev);
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int bcmf_addmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int bcmf_rmmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
#endif
@@ -854,7 +854,7 @@ static int bcmf_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#if defined(CONFIG_NET_IGMP) || defined(CONFIG_NET_ICMPv6)
#if defined(CONFIG_NET_MCASTGROUP) || defined(CONFIG_NET_ICMPv6)
static int bcmf_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct bcmf_dev_s *priv = (FAR struct bcmf_dev_s *)dev->d_private;
@@ -883,7 +883,7 @@ static int bcmf_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int bcmf_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct bcmf_dev_s *priv = (FAR struct bcmf_dev_s *)dev->d_private;
@@ -1113,7 +1113,7 @@ int bcmf_netdev_register(FAR struct bcmf_dev_s *priv)
priv->bc_dev.d_ifup = bcmf_ifup; /* I/F up (new IP address) callback */
priv->bc_dev.d_ifdown = bcmf_ifdown; /* I/F down callback */
priv->bc_dev.d_txavail = bcmf_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
priv->bc_dev.d_addmac = bcmf_addmac; /* Add multicast MAC address */
priv->bc_dev.d_rmmac = bcmf_rmmac; /* Remove multicast MAC address */
#endif
drivers/wireless/ieee802154/xbee/xbee_netdev.c
+4 -4
View File
@@ -211,7 +211,7 @@ static int xbeenet_ifdown(FAR struct net_driver_s *dev);
static void xbeenet_txavail_work(FAR void *arg);
static int xbeenet_txavail(FAR struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int xbeenet_addmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
static int xbeenet_rmmac(FAR struct net_driver_s *dev,
@@ -961,7 +961,7 @@ static int xbeenet_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int xbeenet_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct xbeenet_driver_s *priv = (FAR struct xbeenet_driver_s *)dev->d_private;
@@ -992,7 +992,7 @@ static int xbeenet_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int xbeenet_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
FAR struct xbeenet_driver_s *priv = (FAR struct xbeenet_driver_s *)dev->d_private;
@@ -1383,7 +1383,7 @@ int xbee_netdev_register(XBEEHANDLE xbee)
dev->d_ifup = xbeenet_ifup; /* I/F up (new IP address) callback */
dev->d_ifdown = xbeenet_ifdown; /* I/F down callback */
dev->d_txavail = xbeenet_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
dev->d_addmac = xbeenet_addmac; /* Add multicast MAC address */
dev->d_rmmac = xbeenet_rmmac; /* Remove multicast MAC address */
#endif
drivers/wireless/spirit/drivers/spirit_netdev.c
+4 -4
View File
@@ -336,7 +336,7 @@ static int spirit_ifup(FAR struct net_driver_s *dev);
static int spirit_ifdown(FAR struct net_driver_s *dev);
static int spirit_txavail(FAR struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int spirit_addmac(FAR struct net_driver_s *dev,
FAR const uint8_t *mac);
static int spirit_rmmac(FAR struct net_driver_s *dev,
@@ -2112,7 +2112,7 @@ static int spirit_txavail(FAR struct net_driver_s *dev)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int spirit_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
return -ENOSYS;
@@ -2135,7 +2135,7 @@ static int spirit_addmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
*
****************************************************************************/
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
static int spirit_rmmac(FAR struct net_driver_s *dev, FAR const uint8_t *mac)
{
return -ENOSYS;
@@ -2835,7 +2835,7 @@ int spirit_netdev_initialize(FAR struct spi_dev_s *spi,
dev->d_ifup = spirit_ifup; /* I/F up (new IP address) callback */
dev->d_ifdown = spirit_ifdown; /* I/F down callback */
dev->d_txavail = spirit_txavail; /* New TX data callback */
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
dev->d_addmac = spirit_addmac; /* Add multicast MAC address */
dev->d_rmmac = spirit_rmmac; /* Remove multicast MAC address */
#endif
include/nuttx/net/arp.h
+3
View File
@@ -123,6 +123,9 @@ extern "C"
****************************************************************************/
#ifdef CONFIG_NET_ARP
struct net_driver_s; /* Forward reference */
/****************************************************************************
* Name: arp_ipin
*
include/nuttx/net/mld.h
+1 -1
View File
@@ -224,7 +224,7 @@ struct mld_mcast_addrec_v2_s
{
uint8_t rectype; /* Record type. See definitions above. */
uint8_t auxdatlen; /* Auxiliary data length */
uin16_t nsources; /* Number of sources */
uint16_t nsources; /* Number of sources */
net_ipv6addr_t mcast; /* 128-bit IPv6 multicast address */
net_ipv6addr_t srcaddr[1]; /* Array of source IPv6 address (actual size is
* nsources) */
include/nuttx/net/netdev.h
+7 -3
View File
@@ -63,6 +63,10 @@
# include <nuttx/net/igmp.h>
#endif
#ifdef CONFIG_NET_MLD
# include <nuttx/net/mld.h>
#endif
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -336,8 +340,8 @@ struct net_driver_s
uint16_t d_sndlen;
#ifdef CONFIG_NET_IGMP
/* IGMP group list */
#ifdef CONFIG_NET_MCASTGROUP
/* IGMP/MLD group list */
sq_queue_t grplist;
#endif
@@ -380,7 +384,7 @@ struct net_driver_s
int (*d_ifup)(FAR struct net_driver_s *dev);
int (*d_ifdown)(FAR struct net_driver_s *dev);
int (*d_txavail)(FAR struct net_driver_s *dev);
#ifdef CONFIG_NET_IGMP
#ifdef CONFIG_NET_MCASTGROUP
int (*d_addmac)(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
int (*d_rmmac)(FAR struct net_driver_s *dev, FAR const uint8_t *mac);
#endif
net/Kconfig
+4
View File
@@ -19,6 +19,10 @@ config NET_READAHEAD
bool
default n
config NET_MCASTGROUP
bool
default n
config NET
bool "Networking support"
default n
net/igmp/Kconfig
+2 -1
View File
@@ -6,7 +6,8 @@
config NET_IGMP
bool "IGMPv2 client support"
default n
depends on NET
depends on NET_IPv4
select NET_MCASTGROUP
---help---
Enable IGMPv2 client support.
net/mld/Kconfig
+1
View File
@@ -9,6 +9,7 @@ menuconfig NET_MLD
bool "Multicast Listener Discovery (MLD)"
default n
depends on EXPERIMENTAL
select NET_MCASTGROUP
---help---
Enable Multicast Listener Discovery (MLD) support.

Some files were not shown because too many files have changed in this diff Show More