giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into contrib/rm-button-shutdown

This commit is contained in:
George Oikonomou 2018-09-17 09:21:53 +01:00 committed by GitHub
parent 8f27179782 7445a13ca3
commit dac555f208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/net/ipv6/multicast/esmrf.c
View File

@ -376,7 +376,9 @@ in()
static void
init()
{
UIP_MCAST6_STATS_INIT(NULL);
ESMRF_STATS_INIT();
UIP_MCAST6_STATS_INIT(&stats);
uip_mcast6_route_init();
/* Register the ICMPv6 input handler */
uip_icmp6_register_input_handler(&esmrf_icmp_handler);

9
os/net/ipv6/multicast/esmrf.h
View File

@ -68,16 +68,9 @@
/* Stats datatype */
/*---------------------------------------------------------------------------*/
struct esmrf_stats {
uint16_t mcast_in_unique;
uint16_t mcast_in_all; /* At layer 3 */
uint16_t mcast_in_ours; /* Unique and we are a group member */
uint16_t mcast_fwd; /* Forwarded by us but we are not the seed */
uint16_t mcast_out; /* We are the seed */
uint16_t mcast_bad;
uint16_t mcast_dropped;
uint16_t icmp_out;
uint16_t icmp_in;
uint16_t icmp_bad;
};
/*---------------------------------------------------------------------------*/
#endif /* ESMRF_H_ */

12
os/net/ipv6/multicast/smrf.h
View File

@ -70,18 +70,6 @@
#define SMRF_MAX_SPREAD 4
#endif
/*---------------------------------------------------------------------------*/
/* Stats datatype */
/*---------------------------------------------------------------------------*/
struct smrf_stats {
uint16_t mcast_in_unique;
uint16_t mcast_in_all; /* At layer 3 */
uint16_t mcast_in_ours; /* Unique and we are a group member */
uint16_t mcast_fwd; /* Forwarded by us but we are not the seed */
uint16_t mcast_out; /* We are the seed */
uint16_t mcast_bad;
uint16_t mcast_dropped;
};
/*---------------------------------------------------------------------------*/
#endif /* SMRF_H_ */
/*---------------------------------------------------------------------------*/
/** @} */