This feature/cleanup patchset includes the following patches:
- avoid redundant multicast TT entries, by Linus Luessing
- add netlink support for distributed arp table cache and multicast flags,
by Linus Luessing (2 patches)
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqv59kWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSBaD/9r/oJC+Q/3Eu6DTAAiS7Jx2IpQ
kOwU7l4hkGK8mBZ098CkmHTBY+zurqYwcokCHhKJO5mqJEpvlM27PuQxzqWSBMMO
FWFax2YlKPpJp+/f/rSD9HS73RTY7npv6l5/eFg6+0WSQET04PjLB1KxPrO5u1+Z
JujrAxp0GEyMoVQgMy9uloedkpizhADyYSZzDDXnHhq1NiAPU87cjrTLv/xdtdp7
TvbNfobhZUmKZ951yaRlDmE+mH8IoTQoY7HD/JANnduYeFJAlIPnHQEQa8+5tLwO
qWUeLa4Acv5MhO2KjbKQpu5r2dFbs0x+jmsja8xBmgNWO5meKh/aE8TKGJeDVQEW
TTynEivf82suiquCIZ573fBnliJkipffg32ZHgtNGrh54hh+YU7Sts0t9Lsou4ar
aOU6lup3MHFysf3s9hK6y9TzSqwFJ8Mak0UFsa03r0Ub8am6bKHTqMFaCgN0aK9P
vBL4atSvJVguwPlzxLMi44K4NxqEVfa41dZ7nQ99P3BFzWwSvph3i4lu+cxGxwI7
4kgWU5Cz8T51dH7g8j3vUish36DzwQtUsKLWZVpV+DV4BaHJ/rLyqeug3ffUrWRk
p0bFU7wBAv8rKeFPd30m2tdJ/nMo+rDbN6Tm9n43tK4NWKOGBndhCoNhjfrzhM8U
un6Iy7taISgeElZ5fQ==
=HVxO
-----END PGP SIGNATURE-----
Merge tag 'batadv-next-for-davem-20180319' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- avoid redundant multicast TT entries, by Linus Luessing
- add netlink support for distributed arp table cache and multicast flags,
by Linus Luessing (2 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
755f6633d6
6 changed files with 604 additions and 37 deletions
|
|
@ -91,6 +91,53 @@ enum batadv_tt_client_flags {
|
|||
BATADV_TT_CLIENT_TEMP = (1 << 11),
|
||||
};
|
||||
|
||||
/**
|
||||
* enum batadv_mcast_flags_priv - Private, own multicast flags
|
||||
*
|
||||
* These are internal, multicast related flags. Currently they describe certain
|
||||
* multicast related attributes of the segment this originator bridges into the
|
||||
* mesh.
|
||||
*
|
||||
* Those attributes are used to determine the public multicast flags this
|
||||
* originator is going to announce via TT.
|
||||
*
|
||||
* For netlink, if BATADV_MCAST_FLAGS_BRIDGED is unset then all querier
|
||||
* related flags are undefined.
|
||||
*/
|
||||
enum batadv_mcast_flags_priv {
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_BRIDGED: There is a bridge on top of the mesh
|
||||
* interface.
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_BRIDGED = (1 << 0),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS: Whether an IGMP querier
|
||||
* exists in the mesh
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS = (1 << 1),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS: Whether an MLD querier
|
||||
* exists in the mesh
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS = (1 << 2),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING: If an IGMP querier
|
||||
* exists, whether it is potentially shadowing multicast listeners
|
||||
* (i.e. querier is behind our own bridge segment)
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING = (1 << 3),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING: If an MLD querier
|
||||
* exists, whether it is potentially shadowing multicast listeners
|
||||
* (i.e. querier is behind our own bridge segment)
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),
|
||||
};
|
||||
|
||||
/**
|
||||
* enum batadv_nl_attrs - batman-adv netlink attributes
|
||||
*/
|
||||
|
|
@ -272,6 +319,31 @@ enum batadv_nl_attrs {
|
|||
*/
|
||||
BATADV_ATTR_BLA_CRC,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_DAT_CACHE_IP4ADDRESS: Client IPv4 address
|
||||
*/
|
||||
BATADV_ATTR_DAT_CACHE_IP4ADDRESS,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_DAT_CACHE_HWADDRESS: Client MAC address
|
||||
*/
|
||||
BATADV_ATTR_DAT_CACHE_HWADDRESS,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_DAT_CACHE_VID: VLAN ID
|
||||
*/
|
||||
BATADV_ATTR_DAT_CACHE_VID,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_MCAST_FLAGS: Per originator multicast flags
|
||||
*/
|
||||
BATADV_ATTR_MCAST_FLAGS,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_MCAST_FLAGS_PRIV: Private, own multicast flags
|
||||
*/
|
||||
BATADV_ATTR_MCAST_FLAGS_PRIV,
|
||||
|
||||
/* add attributes above here, update the policy in netlink.c */
|
||||
|
||||
/**
|
||||
|
|
@ -361,6 +433,16 @@ enum batadv_nl_commands {
|
|||
*/
|
||||
BATADV_CMD_GET_BLA_BACKBONE,
|
||||
|
||||
/**
|
||||
* @BATADV_CMD_GET_DAT_CACHE: Query list of DAT cache entries
|
||||
*/
|
||||
BATADV_CMD_GET_DAT_CACHE,
|
||||
|
||||
/**
|
||||
* @BATADV_CMD_GET_MCAST_FLAGS: Query list of multicast flags
|
||||
*/
|
||||
BATADV_CMD_GET_MCAST_FLAGS,
|
||||
|
||||
/* add new commands above here */
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue