diff options
| author | Linus Lüssing <linus.luessing@c0d3.blue> | 2017-02-17 11:17:07 +0100 |
|---|---|---|
| committer | Simon Wunderlich <sw@simonwunderlich.de> | 2017-03-26 12:46:44 +0200 |
| commit | e2d9ba43559e5fcd94a365ba86718332737b0817 (patch) | |
| tree | 0ebe05e8cb92fd74c617b30c837a4ee3dc500dfd /net/batman-adv/soft-interface.c | |
| parent | 99ba18ef0200a824e7bae73f358916b6e3624d62 (diff) | |
| download | linux-stable-e2d9ba43559e5fcd94a365ba86718332737b0817.tar.gz linux-stable-e2d9ba43559e5fcd94a365ba86718332737b0817.tar.bz2 linux-stable-e2d9ba43559e5fcd94a365ba86718332737b0817.zip | |
batman-adv: restructure rebroadcast counter into forw_packet API
This patch refactors the num_packets counter of a forw_packet in the
following three ways:
1) Removed dual-use of forw_packet::num_packets:
-> now for aggregation purposes only
2) Using forw_packet::skb::cb::num_bcasts instead:
-> for easier access in aggregation code later
3) make access to num_bcasts private to batadv_forw_packet_*()
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
[sven@narfation.org: Change num_bcasts to unsigned]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 8226495c6664..a9dbcc1590bd 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -230,6 +230,9 @@ static int batadv_interface_tx(struct sk_buff *skb, if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; + /* reset control block to avoid left overs from previous users */ + memset(skb->cb, 0, sizeof(struct batadv_skb_cb)); + netif_trans_update(soft_iface); vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); |