Renamed filter constant

Mika Leppänen · Mika Leppänen · commit 93f02e4fedd4 · 2017-02-21T14:30:45.000+02:00
diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c b/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c
@@ -299,7 +299,7 @@ err_t k64f_etharp_output_ipv6(struct netif *netif, struct pbuf *q, const ip6_add
 err_t igmp_mac_filter(struct netif *netif, const ip4_addr_t *group, u8_t action)
 {
     switch (action) {
-        case IGMP_ADD_MAC_FILTER:
+        case NETIF_ADD_MAC_FILTER:
         {
             uint32_t group23 = ntohl(group->addr) & 0x007FFFFF;
             uint8_t addr[6];
@@ -312,7 +312,7 @@ err_t igmp_mac_filter(struct netif *netif, const ip4_addr_t *group, u8_t action)
             ENET_AddMulticastGroup(ENET, addr);
             return ERR_OK;
         }
-        case IGMP_DEL_MAC_FILTER:
+        case NETIF_DEL_MAC_FILTER:
             /* As we don't reference count, silently ignore delete requests */
             return ERR_OK;
         default:
@@ -333,7 +333,7 @@ err_t igmp_mac_filter(struct netif *netif, const ip4_addr_t *group, u8_t action)
 err_t mld_mac_filter(struct netif *netif, const ip6_addr_t *group, u8_t action)
 {
     switch (action) {
-        case MLD6_ADD_MAC_FILTER:
+        case NETIF_ADD_MAC_FILTER:
         {
             uint32_t group32 = ntohl(group->addr[3]);
             uint8_t addr[6];
@@ -346,7 +346,7 @@ err_t mld_mac_filter(struct netif *netif, const ip6_addr_t *group, u8_t action)
             ENET_AddMulticastGroup(ENET, addr);
             return ERR_OK;
         }
-        case MLD6_DEL_MAC_FILTER:
+        case NETIF_DEL_MAC_FILTER:
             /* As we don't reference count, silently ignore delete requests */
             return ERR_OK;
         default:
diff --git a/features/FEATURE_LWIP/lwip-interface/lwip_stack.c b/features/FEATURE_LWIP/lwip-interface/lwip_stack.c
@@ -449,7 +449,7 @@ nsapi_error_t mbed_lwip_bringup(bool dhcp, const char *ip, const char *netmask,
   if (lwip_netif.mld_mac_filter != NULL) {
     ip6_addr_t ip6_allnodes_ll;
     ip6_addr_set_allnodes_linklocal(&ip6_allnodes_ll);
-    lwip_netif.mld_mac_filter(&lwip_netif, &ip6_allnodes_ll, MLD6_ADD_MAC_FILTER);
+    lwip_netif.mld_mac_filter(&lwip_netif, &ip6_allnodes_ll, NETIF_ADD_MAC_FILTER);
   }
 #endif /* LWIP_IPV6_MLD */
 

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ err_t k64f_etharp_output_ipv6(struct netif netif, struct pbuf q, const ip6_add`
`299`	`299`	`err_t igmp_mac_filter(struct netif netif, const ip4_addr_t group, u8_t action)`
`300`	`300`	`{`
`301`	`301`	`switch (action) {`
`302`		`- case IGMP_ADD_MAC_FILTER:`
	`302`	`+ case NETIF_ADD_MAC_FILTER:`
`303`	`303`	`{`
`304`	`304`	`uint32_t group23 = ntohl(group->addr) & 0x007FFFFF;`
`305`	`305`	`uint8_t addr[6];`
`@@ -312,7 +312,7 @@ err_t igmp_mac_filter(struct netif netif, const ip4_addr_t group, u8_t action)`
`312`	`312`	`ENET_AddMulticastGroup(ENET, addr);`
`313`	`313`	`return ERR_OK;`
`314`	`314`	`}`
`315`		`- case IGMP_DEL_MAC_FILTER:`
	`315`	`+ case NETIF_DEL_MAC_FILTER:`
`316`	`316`	`/* As we don't reference count, silently ignore delete requests */`
`317`	`317`	`return ERR_OK;`
`318`	`318`	`default:`
`@@ -333,7 +333,7 @@ err_t igmp_mac_filter(struct netif netif, const ip4_addr_t group, u8_t action)`
`333`	`333`	`err_t mld_mac_filter(struct netif netif, const ip6_addr_t group, u8_t action)`
`334`	`334`	`{`
`335`	`335`	`switch (action) {`
`336`		`- case MLD6_ADD_MAC_FILTER:`
	`336`	`+ case NETIF_ADD_MAC_FILTER:`
`337`	`337`	`{`
`338`	`338`	`uint32_t group32 = ntohl(group->addr[3]);`
`339`	`339`	`uint8_t addr[6];`
`@@ -346,7 +346,7 @@ err_t mld_mac_filter(struct netif netif, const ip6_addr_t group, u8_t action)`
`346`	`346`	`ENET_AddMulticastGroup(ENET, addr);`
`347`	`347`	`return ERR_OK;`
`348`	`348`	`}`
`349`		`- case MLD6_DEL_MAC_FILTER:`
	`349`	`+ case NETIF_DEL_MAC_FILTER:`
`350`	`350`	`/* As we don't reference count, silently ignore delete requests */`
`351`	`351`	`return ERR_OK;`
`352`	`352`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ nsapi_error_t mbed_lwip_bringup(bool dhcp, const char ip, const char netmask,`
`449`	`449`	`if (lwip_netif.mld_mac_filter != NULL) {`
`450`	`450`	`ip6_addr_t ip6_allnodes_ll;`
`451`	`451`	`ip6_addr_set_allnodes_linklocal(&ip6_allnodes_ll);`
`452`		`- lwip_netif.mld_mac_filter(&lwip_netif, &ip6_allnodes_ll, MLD6_ADD_MAC_FILTER);`
	`452`	`+ lwip_netif.mld_mac_filter(&lwip_netif, &ip6_allnodes_ll, NETIF_ADD_MAC_FILTER);`
`453`	`453`	`}`
`454`	`454`	`#endif /* LWIP_IPV6_MLD */`
`455`	`455`