From f7543703c2d6880238f6a01a326673faaede3cb7 Mon Sep 17 00:00:00 2001 From: Marek Lindner Date: Tue, 19 Oct 2010 11:59:13 +0200 Subject: [PATCH] --- yaml --- r: 220381 b: refs/heads/master c: 24fb009bae18f2ef712800ee9b2f52c177d9d3f9 h: refs/heads/master i: 220379: 4be5a0bafbc8b0e9d8ceedd5479d0097fa9c2f2b v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/translation-table.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b8514b488dc9..e0d0fd2d34d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c45603024c8dd5321f9504b351df3cb825e5951 +refs/heads/master: 24fb009bae18f2ef712800ee9b2f52c177d9d3f9 diff --git a/trunk/drivers/staging/batman-adv/translation-table.c b/trunk/drivers/staging/batman-adv/translation-table.c index 12b23259c385..681ccbda3eac 100644 --- a/trunk/drivers/staging/batman-adv/translation-table.c +++ b/trunk/drivers/staging/batman-adv/translation-table.c @@ -59,6 +59,7 @@ void hna_local_add(struct net_device *soft_iface, uint8_t *addr) struct hna_global_entry *hna_global_entry; struct hashtable_t *swaphash; unsigned long flags; + int required_bytes; spin_lock_irqsave(&bat_priv->hna_lhash_lock, flags); hna_local_entry = @@ -74,8 +75,12 @@ void hna_local_add(struct net_device *soft_iface, uint8_t *addr) /* only announce as many hosts as possible in the batman-packet and space in batman_packet->num_hna That also should give a limit to MAC-flooding. */ - if ((bat_priv->num_local_hna + 1 > (ETH_DATA_LEN - BAT_PACKET_LEN) - / ETH_ALEN) || + required_bytes = (bat_priv->num_local_hna + 1) * ETH_ALEN; + required_bytes += BAT_PACKET_LEN; + + if ((required_bytes > ETH_DATA_LEN) || + (atomic_read(&bat_priv->aggregation_enabled) && + required_bytes > MAX_AGGREGATION_BYTES) || (bat_priv->num_local_hna + 1 > 255)) { bat_dbg(DBG_ROUTES, bat_priv, "Can't add new local hna entry (%pM): "