diff options
| author | Linus Lüssing <linus.luessing@c0d3.blue> | 2016-03-11 14:04:49 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-06-15 21:28:13 +0100 |
| commit | 10282cba1bcc4a22baf4abb2713a5816d55dfed1 (patch) | |
| tree | 8c5fc27aa144cf58d4dedd3720a7f7dc5ad0688b /net | |
| parent | c1b3b151b541a54f535226142812a823ac86541b (diff) | |
batman-adv: Fix broadcast/ogm queue limit on a removed interface
commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream.
When removing a single interface while a broadcast or ogm packet is
still pending then we will free the forward packet without releasing the
queue slots again.
This patch is supposed to fix this issue.
Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free")
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
[sven@narfation.org: fix conflicts with current version]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/send.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8a684eb738ad..20570dd6d6b7 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -375,6 +375,9 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + forw_packet_free(forw_packet); } } @@ -404,6 +407,9 @@ void purge_outstanding_packets(struct bat_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + forw_packet_free(forw_packet); } } |