commits September 2011

commits@lists.open-mesh.org

1 participants
13 discussions

linux integration; annotated tag, v3.1-rc8, created. v3.1-rc8

by postmaster＠open-mesh.org

The annotated tag, v3.1-rc8 has been created at e7f2a88548df497544d4fafca79836bbd8b6342e (tag) tagging a102a9ece5489e1718cd7543aa079082450ac3a2 (commit) replaces v3.1-rc7 tagged by Linus Torvalds on Tue Sep 27 15:48:45 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 3.1-rc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk6CUtYACgkQF3YsRnbiHLvN+wCbBe5lq6ywGajTfxW/4bdLoMs6 Kv4An2rpqg43l644Cm0iOEXG4eNAjjvw =b8Rh -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

11 years, 8 months

linux integration; annotated tag, v3.1-rc7, created. v3.1-rc7

by postmaster＠open-mesh.org

The annotated tag, v3.1-rc7 has been created at 4cf670b4bbdb31291ffa52ad3f65acd8cd2eb20d (tag) tagging d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (commit) replaces v3.1-rc6 tagged by Linus Torvalds on Wed Sep 21 16:58:25 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 3.1-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk56eiUACgkQF3YsRnbiHLvm1ACglU36d2ToIJNpYYUAkFgk518K FykAn1jjLM7OQPz+X3l2CtT462l1WARr =WN0j -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

11 years, 8 months

linux integration; branch, batman-adv/merge, deleted. v3.1-rc1

by postmaster＠open-mesh.org

The branch, batman-adv/merge has been deleted was 322a8b034003c0d46d39af85bf24fee27b902f48 ----------------------------------------------------------------------- 322a8b034003c0d46d39af85bf24fee27b902f48 Linux 3.1-rc1 ----------------------------------------------------------------------- -- linux integration

11 years, 8 months

linux integration; branch, batman-adv/maint, created. v3.1-rc1

by postmaster＠open-mesh.org

The branch, batman-adv/maint has been created at 322a8b034003c0d46d39af85bf24fee27b902f48 (commit) - Shortlog ------------------------------------------------------------ ----------------------------------------------------------------------- -- linux integration

11 years, 8 months

batman-adv; branch, master, updated. v2011.3.0-20-g3a0be91

by postmaster＠open-mesh.org

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

11 years, 8 months

batman-adv; branch, next, updated. v2011.3.0-18-g2d05b4a

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 2d05b4a9732e16e425b34743cd254117ce554606 Merge: 89526f54915deb7158520907d2d70fac9b2cd694 ac8ad7e77e0f03067614fefd84ca972f8da04aca Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Sep 22 14:19:17 2011 +0200 Merge branch 'maint' into next Conflicts: soft-interface.c diff --combined soft-interface.c index aceeabc,05dd351..652fb7b --- a/soft-interface.c +++ b/soft-interface.c @@@ -445,31 -445,30 +445,31 @@@ static void softif_batman_recv(struct s { struct bat_priv *bat_priv = netdev_priv(dev); struct ethhdr *ethhdr = (struct ethhdr *)skb->data; - struct batman_packet *batman_packet; + struct batman_ogm_packet *batman_ogm_packet; struct softif_neigh *softif_neigh = NULL; struct hard_iface *primary_if = NULL; struct softif_neigh *curr_softif_neigh = NULL; if (ntohs(ethhdr->h_proto) == ETH_P_8021Q) - batman_packet = (struct batman_packet *) + batman_ogm_packet = (struct batman_ogm_packet *) (skb->data + ETH_HLEN + VLAN_HLEN); else - batman_packet = (struct batman_packet *)(skb->data + ETH_HLEN); + batman_ogm_packet = (struct batman_ogm_packet *) + (skb->data + ETH_HLEN); - if (batman_packet->version != COMPAT_VERSION) + if (batman_ogm_packet->version != COMPAT_VERSION) goto out; - if (batman_packet->packet_type != BAT_PACKET) + if (batman_ogm_packet->packet_type != BAT_OGM) goto out; - if (!(batman_packet->flags & PRIMARIES_FIRST_HOP)) + if (!(batman_ogm_packet->flags & PRIMARIES_FIRST_HOP)) goto out; - if (is_my_mac(batman_packet->orig)) + if (is_my_mac(batman_ogm_packet->orig)) goto out; - softif_neigh = softif_neigh_get(bat_priv, batman_packet->orig, vid); + softif_neigh = softif_neigh_get(bat_priv, batman_ogm_packet->orig, vid); if (!softif_neigh) goto out; @@@ -533,11 -532,11 +533,11 @@@ static int interface_set_mac_addr(struc if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; - /* only modify transtable if it has been initialised before */ + /* only modify transtable if it has been initialized before */ if (atomic_read(&bat_priv->mesh_state) == MESH_ACTIVE) { tt_local_remove(bat_priv, dev->dev_addr, "mac address changed", false); - tt_local_add(dev, addr->sa_data); + tt_local_add(dev, addr->sa_data, NULL_IFINDEX); } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); @@@ -566,7 -565,7 +566,7 @@@ static int interface_tx(struct sk_buff 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; @@@ -596,19 -595,18 +596,19 @@@ goto dropped; /* Register the client MAC in the transtable */ - tt_local_add(soft_iface, ethhdr->h_source); + tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); - orig_node = transtable_search(bat_priv, ethhdr->h_dest); + orig_node = transtable_search(bat_priv, ethhdr->h_source, + 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 */ @@@ -741,9 -739,6 +741,9 @@@ void interface_rx(struct net_device *so soft_iface->last_rx = jiffies; + if (is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) + goto dropped; + netif_rx(skb); goto out; @@@ -801,8 -796,10 +801,8 @@@ struct net_device *softif_create(const soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup); - if (!soft_iface) { - pr_err("Unable to allocate the batman interface: %s\n", name); + if (!soft_iface) goto out; - } ret = register_netdevice(soft_iface); if (ret < 0) { @@@ -815,7 -812,6 +815,7 @@@ atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); + atomic_set(&bat_priv->ap_isolation, 0); atomic_set(&bat_priv->vis_mode, VIS_TYPE_CLIENT_UPDATE); atomic_set(&bat_priv->gw_mode, GW_MODE_OFF); atomic_set(&bat_priv->gw_sel_class, 20); -- batman-adv

11 years, 8 months

batman-adv; branch, maint, updated. v2011.3.0-1-gac8ad7e

by postmaster＠open-mesh.org

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

11 years, 8 months

batman-adv; branch, master, updated. v2011.3.0-17-g6ec6655

by postmaster＠open-mesh.org

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

11 years, 8 months

linux integration; annotated tag, v3.1-rc6, created. v3.1-rc6

by postmaster＠open-mesh.org

The annotated tag, v3.1-rc6 has been created at 8ff02915cf6ca8f5ecda04e0a2150507df89846b (tag) tagging b6fd41e29dea9c6753b1843a77e50433e6123bcb (commit) replaces v3.1-rc5 tagged by Linus Torvalds on Mon Sep 12 14:02:11 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 3.1-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk5uc2AACgkQF3YsRnbiHLsy7ACgsRhy5E7QvZZOgUVQU81pZm9U pL0An0LtfjcQI0sux/GR5DtI2CcUCm9h =cJ/U -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

11 years, 8 months

linux integration; annotated tag, v3.1-rc5, created. v3.1-rc5

by postmaster＠open-mesh.org

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

11 years, 8 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2011