iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: BATMAN_V: aggregate OGMv2 packets

Browse Source 
Instead of transmitting individual OGMv2 packets from the aggregation
queue merge those OGMv2 packets into a single one and transmit this
aggregate instead.

This reduces overhead as it saves an ethernet header and a transmission
per aggregated OGMv2 packet.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
This commit is contained in:
Linus Lüssing 2019-08-04 20:54:54 +02:00 committed by Simon Wunderlich
parent f89255a02f
commit 9cb9a17813
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
net/batman-adv/bat_v_ogm.c
View File

@ -191,18 +191,44 @@ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface)
* batadv_v_ogm_aggr_send() - flush & send aggregation queue * batadv_v_ogm_aggr_send() - flush & send aggregation queue
* @hard_iface: the interface with the aggregation queue to flush * @hard_iface: the interface with the aggregation queue to flush
* *
* Aggregates all OGMv2 packets currently in the aggregation queue into a
* single OGMv2 packet and transmits this aggregate.
*
* The aggregation queue is empty after this call.
*
* Caller needs to hold the hard_iface->bat_v.aggr_list_lock. * Caller needs to hold the hard_iface->bat_v.aggr_list_lock.
*/ */
static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface)
{ {
unsigned int aggr_len = hard_iface->bat_v.aggr_len;
struct sk_buff *skb_aggr;
unsigned int ogm_len;
struct sk_buff *skb; struct sk_buff *skb;
lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock);
if (!aggr_len)
return;
skb_aggr = dev_alloc_skb(aggr_len + ETH_HLEN + NET_IP_ALIGN);
if (!skb_aggr) {
batadv_v_ogm_aggr_list_free(hard_iface);
return;
}
skb_reserve(skb_aggr, ETH_HLEN + NET_IP_ALIGN);
skb_reset_network_header(skb_aggr);
while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) { while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) {
hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb); hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb);
batadv_v_ogm_send_to_if(skb, hard_iface);
ogm_len = batadv_v_ogm_len(skb);
skb_put_data(skb_aggr, skb->data, ogm_len);
consume_skb(skb);
} }
batadv_v_ogm_send_to_if(skb_aggr, hard_iface);
} }
/** /**