diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-18 14:57:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-18 14:57:59 -0700 |
| commit | 8f623a10c31bf7dd9cbb10bb53555b83d5ea3192 (patch) | |
| tree | 6237c1afcea47b5088f5d5b2ba8780784821e54c /net/batman-adv/bridge_loop_avoidance.h | |
| parent | a128592799b89d3985331d261fa4d41868ee4b04 (diff) | |
| parent | 2369e827046920ef0599e6a36b975ac5c0a359c2 (diff) | |
| download | linux-8f623a10c31bf7dd9cbb10bb53555b83d5ea3192.tar.gz linux-8f623a10c31bf7dd9cbb10bb53555b83d5ea3192.tar.bz2 linux-8f623a10c31bf7dd9cbb10bb53555b83d5ea3192.zip | |
Merge tag 'batadv-net-for-davem-20200918' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are some batman-adv bugfixes:
- fix wrong type use in backbone_gw hash, by Linus Luessing
- disable TT re-routing for multicast packets, by Linus Luessing
- Add missing include for in_interrupt(), by Sven Eckelmann
- fix BLA/multicast issues for packets sent via unicast,
by Linus Luessing (3 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bridge_loop_avoidance.h')
| -rw-r--r-- | net/batman-adv/bridge_loop_avoidance.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 41edb2c4a327..a81c41b636f9 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -35,7 +35,7 @@ static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac) #ifdef CONFIG_BATMAN_ADV_BLA bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, - unsigned short vid, bool is_bcast); + unsigned short vid, int packet_type); bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned short vid); bool batadv_bla_is_backbone_gw(struct sk_buff *skb, @@ -66,7 +66,7 @@ bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, static inline bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned short vid, - bool is_bcast) + int packet_type) { return false; } |