The branch, batman-adv/merge has been deleted
was 322a8b034003c0d46d39af85bf24fee27b902f48
-----------------------------------------------------------------------
322a8b034003c0d46d39af85bf24fee27b902f48 Linux 3.1-rc1
-----------------------------------------------------------------------
--
linux integration
The branch, batman-adv/maint has been created
at 322a8b034003c0d46d39af85bf24fee27b902f48 (commit)
- Shortlog ------------------------------------------------------------
-----------------------------------------------------------------------
--
linux integration
The following commit has been merged in the master branch:
commit 3a0be91a0f6b32ee1a2151d5f8b82e6fa66e2fcf
Merge: 6ec6655451f681626a1e6cc257d3a809535e5a7c 2d05b4a9732e16e425b34743cd254117ce554606
Author: Marek Lindner <lindner_marek(a)yahoo.de>
Date: Thu Sep 22 14:20:15 2011 +0200
Merge branch 'next'
--
batman-adv
The following commit has been merged in the maint branch:
commit ac8ad7e77e0f03067614fefd84ca972f8da04aca
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Wed Sep 21 16:06:42 2011 +0200
batman-adv: do_bcast has to be true for broadcast packets only
corrects a critical bug of the GW feature. This bug made all the unicast
packets destined to a GW to be sent as broadcast. This bug is present even if
the sender GW feature is configured as OFF. It's an urgent bug fix and should
be committed as soon as possible.
This was a regression introduced by 17852faeb269bc72f6ff542e21c0b3056fb99c48
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/soft-interface.c b/soft-interface.c
index 3e2f91f..05dd351 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -565,7 +565,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
struct orig_node *orig_node = NULL;
int data_len = skb->len, ret;
short vid = -1;
- bool do_bcast = false;
+ bool do_bcast;
if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE)
goto dropped;
@@ -598,15 +598,15 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
tt_local_add(soft_iface, ethhdr->h_source);
orig_node = transtable_search(bat_priv, ethhdr->h_dest);
- if (is_multicast_ether_addr(ethhdr->h_dest) ||
- (orig_node && orig_node->gw_flags)) {
+ do_bcast = is_multicast_ether_addr(ethhdr->h_dest);
+ if (do_bcast || (orig_node && orig_node->gw_flags)) {
ret = gw_is_target(bat_priv, skb, orig_node);
if (ret < 0)
goto dropped;
- if (ret == 0)
- do_bcast = true;
+ if (ret)
+ do_bcast = false;
}
/* ethernet packet should be broadcasted */
--
batman-adv
The following commit has been merged in the master branch:
commit 6ec6655451f681626a1e6cc257d3a809535e5a7c
Author: Antonio Quartulli <ordex(a)autistici.org>
Date: Mon Sep 19 12:29:19 2011 +0200
batman-adv: tt_global_del_orig() has to print the correct message
When deleting the entries, tt_global_del_orig() has to print the message passed
as argument instead of a static one.
Signed-off-by: Antonio Quartulli <ordex(a)autistici.org>
diff --git a/translation-table.c b/translation-table.c
index cc53f78..7de9960 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -720,9 +720,10 @@ void tt_global_del_orig(struct bat_priv *bat_priv,
if (tt_global_entry->orig_node == orig_node) {
bat_dbg(DBG_TT, bat_priv,
"Deleting global tt entry %pM "
- "(via %pM): originator time out\n",
+ "(via %pM): %s\n",
tt_global_entry->addr,
- tt_global_entry->orig_node->orig);
+ tt_global_entry->orig_node->orig,
+ message);
hlist_del_rcu(node);
tt_global_entry_free_ref(tt_global_entry);
}
--
batman-adv
The annotated tag, v3.1-rc5 has been created
at dba5cf0231a4c3091c0f3b7236c6978dab8cbc97 (tag)
tagging ddf28352b80c86754a6424e3a61e8bdf9213b3c7 (commit)
replaces v3.1-rc4
tagged by Linus Torvalds
on Sun Sep 4 15:45:28 2011 -0700
- Shortlog ------------------------------------------------------------
Linux 3.1-rc5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
iEYEABECAAYFAk5j/5EACgkQF3YsRnbiHLt94ACdEw+f3atxB4wEwTp6WXwoFV66
oXcAni5OAZtbfEj2oUh/kxwUDTEC/Rg/
=jFLQ
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration