summaryrefslogtreecommitdiff
path: root/net/batman-adv
diff options
context:
space:
mode:
authorSimon Wunderlich <simon@open-mesh.com>2015-06-24 15:50:20 +0300
committerAntonio Quartulli <antonio@meshcoding.com>2015-08-14 23:52:09 +0300
commit3f1e08d0ae6746379b9e21264dae52f4f35c7ad2 (patch)
tree8896c66e8306c0956e8b88a30ca1484a7d24ec07 /net/batman-adv
parent1f155101646e6f6cda218534ff6e252ff625137b (diff)
downloadlinux-3f1e08d0ae6746379b9e21264dae52f4f35c7ad2.tar.xz
batman-adv: remove broadcast packets scheduled for purged outgoing if
When an interface is purged, the broadcast packets scheduled for this interface should get purged as well. Signed-off-by: Simon Wunderlich <simon@open-mesh.com> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/send.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 0a01992e65ab..191076ef1eca 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -616,7 +616,8 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
* we delete only packets belonging to the given interface
*/
if ((hard_iface) &&
- (forw_packet->if_incoming != hard_iface))
+ (forw_packet->if_incoming != hard_iface) &&
+ (forw_packet->if_outgoing != hard_iface))
continue;
spin_unlock_bh(&bat_priv->forw_bcast_list_lock);