linux-merge

linux-merge@lists.open-mesh.org

2 participants
7455 discussions

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 19 May '12

19 May '12

--- batman-adv_master.packet.h 2012-05-20 00:15:01.127136078 +0200 +++ batctl_master.packet.h 2012-05-20 00:15:01.131136385 +0200 @@ -23,14 +23,22 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, - BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, + BAT_UNICAST_FRAG = 0x06, + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08, + BAT_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ @@ -160,6 +168,12 @@ uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */

1 0

Build check errors found: 2012-05-19
by postmaster＠open-mesh.org 18 May '12

18 May '12

Name of failed tests ==================== sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ sparse master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> /home/batman/build_test/tmp/bat_debugfs.c: In function 'batadv_dbg': /home/batman/build_test/tmp/main.h:211: sorry, unimplemented: function 'batadv_dbg' can never be inlined because it uses variable argument lists make[2]: *** [/home/batman/build_test/tmp/bat_debugfs.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2

1 0

Build check errors found: 2012-05-18
by postmaster＠open-mesh.org 17 May '12

17 May '12

Name of failed tests ==================== unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> batadv_tt_local_crc

1 0

Build check errors found: 2012-05-17
by postmaster＠open-mesh.org 16 May '12

16 May '12

Name of failed tests ==================== unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y Output of different failed tests ================================ unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> batadv_tt_local_crc

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit 521251f2f5fa16747cc21e71580e404af855d140 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Jan 16 00:36:58 2012 +0100 batman-adv: unset the TT_CLIENT_PENDING flag if the new local entry already exists When trying to add a new tt_local_entry, if such entry already exists, we have to ensure that the TT_CLIENT_PENDING flag is not set, otherwise the entry will be deleted soon. Reported-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index b3fb597..a66c2dc 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -206,6 +206,8 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr, if (tt_local_entry) { tt_local_entry->last_seen = jiffies; + /* possibly unset the TT_CLIENT_PENDING flag */ + tt_local_entry->common.flags &= ~TT_CLIENT_PENDING; goto out; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit 679695813c0e29ecab666210752c9c0b4dd9f01c Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Mar 26 16:22:45 2012 +0200 batman-adv: use shorter pr_warn instead of pr_warning Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 0b84bb1..dc334fa 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -173,9 +173,9 @@ static void check_known_mac_addr(const struct net_device *net_dev) net_dev->dev_addr)) continue; - pr_warning("The newly added mac address (%pM) already exists on: %s\n", - net_dev->dev_addr, hard_iface->net_dev->name); - pr_warning("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); + pr_warn("The newly added mac address (%pM) already exists on: %s\n", + net_dev->dev_addr, hard_iface->net_dev->name); + pr_warn("It is strongly recommended to keep mac addresses unique to avoid problems!\n"); } rcu_read_unlock(); } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 8e74d97..f47299f 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -45,8 +45,8 @@ int send_skb_packet(struct sk_buff *skb, struct hard_iface *hard_iface, goto send_skb_err; if (!(hard_iface->net_dev->flags & IFF_UP)) { - pr_warning("Interface %s is not up - can't send packet via that interface!\n", - hard_iface->net_dev->name); + pr_warn("Interface %s is not up - can't send packet via that interface!\n", + hard_iface->net_dev->name); goto send_skb_err; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit a77e8c61dbe9c6abb7072c02f41271a489370f0c Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Apr 2 19:31:26 2012 +0200 batman-adv: README cleanups - Add routing_algo - Remove date from README: The date has to be updated when a patch touches the README. Therefore, nearly every feature will modify this date. It can happens quite often that not only one feature is currently in development or waiting on the mailinglist. This creates merge conflicts when applying a patchset. The date itself doesn't provide any additional information when this file is only available in a release tarball or as part of a SCM repository. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 220a58c..75a5923 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -1,5 +1,3 @@ -[state: 21-08-2011] - BATMAN-ADV ---------- @@ -68,10 +66,11 @@ All mesh wide settings can be found in batman's own interface folder: # ls /sys/class/net/bat0/mesh/ -# aggregated_ogms fragmentation hop_penalty -# ap_isolation gw_bandwidth log_level -# bonding gw_mode orig_interval -# bridge_loop_avoidance gw_sel_class vis_mode +# aggregated_ogms gw_bandwidth log_level +# ap_isolation gw_mode orig_interval +# bonding gw_sel_class routing_algo +# bridge_loop_avoidance hop_penalty vis_mode +# fragmentation There is a special folder for debugging information: -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit e01572654a43329ae9ed0708931f577b5e0e6731 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Mar 30 18:44:09 2012 +0200 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index fd83acd..f4a3ec0 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -28,7 +28,7 @@ #define DRIVER_DEVICE "batman-adv" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.1.0" +#define SOURCE_VERSION "2012.2.0" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit 8c7bf248a318444accbe0c2c5db15bd727661606 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Mar 17 15:28:33 2012 +0800 batman-adv: refactor window_protected to avoid unnecessary return statement Reported-by: David Laight <David.Laight(a)aculab.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index b1824bb..840e2c6 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -234,17 +234,14 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, { if ((seq_num_diff <= -TQ_LOCAL_WINDOW_SIZE) || (seq_num_diff >= EXPECTED_SEQNO_RANGE)) { - if (has_timed_out(*last_reset, RESET_PROTECTION_MS)) { - - *last_reset = jiffies; - bat_dbg(DBG_BATMAN, bat_priv, - "old packet received, start protection\n"); - - return 0; - } else { + if (!has_timed_out(*last_reset, RESET_PROTECTION_MS)) return 1; - } + + *last_reset = jiffies; + bat_dbg(DBG_BATMAN, bat_priv, + "old packet received, start protection\n"); } + return 0; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120516
by batman＠open-mesh.org 16 May '12

16 May '12

The following commit has been merged in the master branch: commit 3275e7cc84fb0574e9662e8e74c3b1dab38f7143 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Mar 16 18:03:28 2012 +0100 batman-adv: improve unicast packet (re)routing In case of a client X roaming from a generic node A to another node B, it is possible that a third node C gets A's OGM but not B's. At this point in time, if C wants to send data to X it will send a unicast packet destined to A. The packet header will contain A's last ttvn (C got A's OGM and so it knows it). The packet will travel towards A without being intercepted because the ttvn contained in its header is the newest for A. Once A will receive the packet, A's state will not report to be in a "roaming phase" (because, after a roaming, once A sends out its OGM, all the changes are committed and the node is considered not to be in the roaming state anymore) and it will match the ttvn carried by the packet. Therefore there is no reason for A to try to alter the packet's route, thus dropping the packet because the destination client is not there anymore. However, C is well aware that it's routing information towards the client X is outdated as it received an OGM from A saying that the client roamed away. Thanks to this detail, this patch introduces a small change in behaviour: as long as C is in the state of not knowing the new location of client X it will forward the traffic to its last known location using ttvn-1 of the destination. By using an older ttvn node A will be forced to re-route the packet. Intermediate nodes are also allowed to update the packet's destination as long as they have the information about the client's new location. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 4c6467d..b1824bb 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -923,6 +923,13 @@ static int check_unicast_ttvn(struct bat_priv *bat_priv, ethhdr = (struct ethhdr *)(skb->data + sizeof(struct unicast_packet)); + + /* we don't have an updated route for this client, so we should + * not try to reroute the packet!! + */ + if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) + return 1; + orig_node = transtable_search(bat_priv, NULL, ethhdr->h_dest); if (!orig_node) { diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 2cb46f0..b3fb597 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2117,3 +2117,22 @@ request_table: } } } + +/* returns true whether we know that the client has moved from its old + * originator to another one. This entry is kept is still kept for consistency + * purposes + */ +bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr) +{ + struct tt_global_entry *tt_global_entry; + bool ret = false; + + tt_global_entry = tt_global_hash_find(bat_priv, addr); + if (!tt_global_entry) + goto out; + + ret = tt_global_entry->common.flags & TT_CLIENT_ROAM; + tt_global_entry_free_ref(tt_global_entry); +out: + return ret; +} diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 593d1b3..c43374d 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -53,5 +53,7 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst); void tt_update_orig(struct bat_priv *bat_priv, struct orig_node *orig_node, const unsigned char *tt_buff, uint8_t tt_num_changes, uint8_t ttvn, uint16_t tt_crc); +bool tt_global_client_is_roaming(struct bat_priv *bat_priv, uint8_t *addr); + #endif /* _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ */ diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c index 676f6a6..74175c2 100644 --- a/net/batman-adv/unicast.c +++ b/net/batman-adv/unicast.c @@ -331,6 +331,14 @@ find_router: unicast_packet->ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); + /* inform the destination node that we are still missing a correct route + * for this client. The destination will receive this packet and will + * try to reroute it because the ttvn contained in the header is less + * than the current one + */ + if (tt_global_client_is_roaming(bat_priv, ethhdr->h_dest)) + unicast_packet->ttvn = unicast_packet->ttvn - 1; + if (atomic_read(&bat_priv->fragmentation) && data_len + sizeof(*unicast_packet) > neigh_node->if_incoming->net_dev->mtu) { -- LinuxNextTracking

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge