commits March 2013

commits@lists.open-mesh.org

1 participants
73 discussions

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been updated to 2f8800869688941db44bcd160c4836bd8baa0fbf (tag) from 8949f106e8f51c069f8db11c7c920e7af0ebeed0 (which is now obsolete) tagging 0c81465357ffe29da9ff20103afe4a59908e0d30 (commit) replaces v3.9-rc3 tagged by Antonio Quartulli on Wed Mar 27 11:11:58 2013 +0100 - Shortlog ------------------------------------------------------------ Included changes: - A fix for the network coding component which has been added within the last pull request (so it is in linux-3.10). The problem has been spotted thanks to Fengguang Wu's automated daily checks on our tree. - Implementation of the RTNL API for virtual interface creation/deletion and slave manipulation - substitution of seq_printf with seq_puts when possible - minor cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABCAAGBQJRUsb7AAoJEADl0hg6qKeOf/sQAJ4VRwpB5WLIjtLPQ1Dvd/qu thPAn4vpv02Is8H7NRULRN9aqUIzWrWtXkhBTAOh0EHq3mki6a+QT4TUQ4qswTPv BaVS70hoTtN1OdcntWTATCUuX2Y2HD/D3Cw2IZIG7X9oqTEpoTpnuQygMsG/c1+s MtNO57/WUKlwLv0pAu9IHh4qCj00eF5YHsPmsWzoWAvi/4aCgESQfXGy4Dm6HqLB E8XuVLOLtw7NSw0V7n//KtEE2llTWkfslm06dSsAmqEtzOfOCCuA4Z0asnMPJt7s 4HknqNE0D0aR0sfS+W6G24gFQbIV8R4SYWnUfMFCvvT7Ds96RONdgkfWw39nM7XB y70kXUbfDBIeHiiV2uqbTZnbuAa61p8Y8jCJvWz0nujI1/QPnUA1bqEgC2AMTc1J I6rS8mhWC6Rg+ohkK7HSQfgiZ5xcWtjFuVuOhKr0cPwhaCI0yP5PCB/B3yxuJxwD egkL58fgPhgii3DOxInAqLS/aPT5vl49J91qC3+z2/xYS3zRxHsyIRkMwgfoI2Ab TofVmzKqDwENA+CnjCPQx2gn6w/QpK8g5xmW1GgbzuKddiCcQFKnezgpeSdnQrsM CP/8Tu6r3QSLlHebysMuhsCwyT1hv8Yt0PTDpBqtIXRpV5enTYa9xW3F+UTU65ZY p9fKQXJYDLLEhfcy/TJM =FoTZ -----END PGP SIGNATURE----- Antonio Quartulli (4): batman-adv: don't use !! in bool conversion batman-adv: free an hard-interface before adding it batman-adv: update Makefile copyright years batman-adv: use seq_puts instead of seq_printf when the format is constant Marek Lindner (3): batman-adv: verify tt len does not exceed packet len batman-adv: replace redundant primary_if_get calls batman-adv: rename batadv_softif_destroy to reflect sysfs use case Martin Hundebøll (8): batman-adv: Return reason for failure in batadv_check_unicast_packet() batman-adv: network coding - add the initial infrastructure code batman-adv: network coding - detect coding nodes and remove these after timeout batman-adv: network coding - buffer unicast packets before forward batman-adv: network coding - code and transmit packets if possible batman-adv: network coding - save overheard and tx packets for decoding batman-adv: network coding - receive coded packets and decode them batman-adv: Fix endianness errors for network coding Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (5): batman-adv: Move soft-interface initialization to ndo_init batman-adv: Move deinitialization of soft-interface to destructor batman-adv: Don't always delete softif when last slave was removed batman-adv: Allow to use rntl_link for device creation/deletion batman-adv: Allow to modify slaves of soft-interfaces through rntl_link ----------------------------------------------------------------------- -- linux integration

10 years

[linux-merge]linux integration; branch, merge/master, updated. v3.9-rc1-1737-g9090211

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit 9090211776319028d1735e8a86727ac48ecf588e Merge: b906204f0dfb5ff298d9499d8da3b26113eed90c a1eecddcb39f1a25506683d98ce349087b258ab4 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Mar 27 09:54:39 2013 +0100 Merge remote-tracking branch 'pkg/next' into merge/master Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Conflicts: net/batman-adv/compat.h diff --combined net/batman-adv/gateway_client.c index 34f99a4,f105219..f105219 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@@ -500,7 -500,7 +500,7 @@@ int batadv_gw_client_seq_print_text(str rcu_read_unlock(); if (gw_count == 0) - seq_printf(seq, "No gateways in range ...\n"); + seq_puts(seq, "No gateways in range ...\n"); out: if (primary_if) diff --combined net/batman-adv/hard-interface.c index fd99e42,522243a..522243a --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -307,6 -307,30 +307,30 @@@ batadv_hardif_deactivate_interface(stru batadv_update_min_mtu(hard_iface->soft_iface); } + /** + * batadv_master_del_slave - remove hard_iface from the current master interface + * @slave: the interface enslaved in another master + * @master: the master from which slave has to be removed + * + * Invoke ndo_del_slave on master passing slave as argument. In this way slave + * is free'd and master can correctly change its internal state. + * Return 0 on success, a negative value representing the error otherwise + */ + static int batadv_master_del_slave(struct batadv_hard_iface *slave, + struct net_device *master) + { + int ret; + + if (!master) + return 0; + + ret = -EBUSY; + if (master->netdev_ops->ndo_del_slave) + ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev); + + return ret; + } + int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { @@@ -346,8 -370,9 +370,9 @@@ * in that case unlink it first */ master = netdev_master_upper_dev_get(hard_iface->net_dev); - if (master) - netdev_upper_dev_unlink(hard_iface->net_dev, master); + ret = batadv_master_del_slave(hard_iface, master); + if (ret) + goto err_dev; hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); @@@ -410,6 -435,7 +435,7 @@@ out err_upper: netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface); err_dev: + hard_iface->soft_iface = NULL; dev_put(soft_iface); err: batadv_hardif_free_ref(hard_iface); diff --combined net/batman-adv/main.c index 62b1f89,6277735..6277735 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@@ -419,7 -419,7 +419,7 @@@ int batadv_algo_seq_print_text(struct s { struct batadv_algo_ops *bat_algo_ops; - seq_printf(seq, "Available routing algorithms:\n"); + seq_puts(seq, "Available routing algorithms:\n"); hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) { seq_printf(seq, "%s\n", bat_algo_ops->name); diff --combined net/batman-adv/network-coding.c index 086c107,6b9a544..6b9a544 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@@ -1760,23 -1760,23 +1760,23 @@@ int batadv_nc_nodes_seq_print_text(stru hlist_for_each_entry_rcu(orig_node, head, hash_entry) { seq_printf(seq, "Node: %pM\n", orig_node->orig); - seq_printf(seq, " Ingoing: "); + seq_puts(seq, " Ingoing: "); /* For each in_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->in_coding_list, list) seq_printf(seq, "%pM ", nc_node->addr); - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); - seq_printf(seq, " Outgoing: "); + seq_puts(seq, " Outgoing: "); /* For out_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->out_coding_list, list) seq_printf(seq, "%pM ", nc_node->addr); - seq_printf(seq, "\n\n"); + seq_puts(seq, "\n\n"); } rcu_read_unlock(); } diff --combined net/batman-adv/originator.c index 585e684,2f34525..2f34525 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -465,7 -465,7 +465,7 @@@ int batadv_orig_seq_print_text(struct s neigh_node_tmp->tq_avg); } - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); batman_count++; next: @@@ -475,7 -475,7 +475,7 @@@ } if (batman_count == 0) - seq_printf(seq, "No batman nodes in range ...\n"); + seq_puts(seq, "No batman nodes in range ...\n"); out: if (primary_if) diff --combined net/batman-adv/vis.c index c053244,962ccf3..962ccf3 --- a/net/batman-adv/vis.c +++ b/net/batman-adv/vis.c @@@ -149,7 -149,7 +149,7 @@@ static void batadv_vis_data_read_prim_s hlist_for_each_entry(entry, if_list, list) { if (entry->primary) - seq_printf(seq, "PRIMARY, "); + seq_puts(seq, "PRIMARY, "); else seq_printf(seq, "SEC %pM, ", entry->addr); } @@@ -207,7 -207,7 +207,7 @@@ static void batadv_vis_data_read_entrie if (batadv_compare_eth(entry->addr, packet->vis_orig)) batadv_vis_data_read_prim_sec(seq, list); - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); } } -- linux integration

10 years

[batman-adv] master's head updated: Merge branch 'next' (b3b036c)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 9e96c4d batman-adv: fix old master freeing operation 174cf3a batman-adv: use seq_puts instead of seq_printf when the format is constant a1eecdd batman-adv: fix interface clean up on error b3b036c Merge branch 'next'

10 years

[batman-adv] master: Merge branch 'next' (b3b036c)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b3b036c5e081b4aa8c3cfb5e4cfb5541c21ed2b3 Merge: 2e4003c a1eecdd Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Mar 25 18:18:23 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- b3b036c5e081b4aa8c3cfb5e4cfb5541c21ed2b3 compat.h | 3 +++ gateway_client.c | 2 +- hard-interface.c | 30 ++++++++++++++++++++++++++++-- main.c | 2 +- network-coding.c | 8 ++++---- originator.c | 4 ++-- vis.c | 4 ++-- 7 files changed, 41 insertions(+), 12 deletions(-)

10 years

[batman-adv] next: batman-adv: fix interface clean up on error (a1eecdd)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit a1eecddcb39f1a25506683d98ce349087b258ab4 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Mar 25 09:24:10 2013 +0100 batman-adv: fix interface clean up on error When enabling an hard_iface for the first time, the hard_iface->soft_iface member is initialised with the newly created soft_iface. However, in case of error during the activation procedure this member has to be set to NULL again, otherwise the hard_iface will result busy and will not be possible to use it anymore This issue has been introduced with edd08535c00a42143989118bc999060893ce0a41 ("batman-adv: Allow to modify slaves of soft-interfaces through rntl_link") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- a1eecddcb39f1a25506683d98ce349087b258ab4 hard-interface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hard-interface.c b/hard-interface.c index 37c1b51..522243a 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -435,6 +435,7 @@ out: err_upper: netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface); err_dev: + hard_iface->soft_iface = NULL; dev_put(soft_iface); err: batadv_hardif_free_ref(hard_iface);

10 years

[batman-adv] next: batman-adv: use seq_puts instead of seq_printf when the format is constant (174cf3a)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 174cf3a4fd171a80e9e12b163754ec05c607f73e Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Mar 21 09:23:29 2013 +0100 batman-adv: use seq_puts instead of seq_printf when the format is constant As reported by checkpatch, seq_puts has to be preferred with respect to seq_printf when the format is a constant string (no va_args) Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 174cf3a4fd171a80e9e12b163754ec05c607f73e gateway_client.c | 2 +- main.c | 2 +- network-coding.c | 8 ++++---- originator.c | 4 ++-- vis.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gateway_client.c b/gateway_client.c index 34f99a4..f105219 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -500,7 +500,7 @@ int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset) rcu_read_unlock(); if (gw_count == 0) - seq_printf(seq, "No gateways in range ...\n"); + seq_puts(seq, "No gateways in range ...\n"); out: if (primary_if) diff --git a/main.c b/main.c index 62b1f89..6277735 100644 --- a/main.c +++ b/main.c @@ -419,7 +419,7 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset) { struct batadv_algo_ops *bat_algo_ops; - seq_printf(seq, "Available routing algorithms:\n"); + seq_puts(seq, "Available routing algorithms:\n"); hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) { seq_printf(seq, "%s\n", bat_algo_ops->name); diff --git a/network-coding.c b/network-coding.c index 086c107..6b9a544 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1760,23 +1760,23 @@ int batadv_nc_nodes_seq_print_text(struct seq_file *seq, void *offset) hlist_for_each_entry_rcu(orig_node, head, hash_entry) { seq_printf(seq, "Node: %pM\n", orig_node->orig); - seq_printf(seq, " Ingoing: "); + seq_puts(seq, " Ingoing: "); /* For each in_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->in_coding_list, list) seq_printf(seq, "%pM ", nc_node->addr); - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); - seq_printf(seq, " Outgoing: "); + seq_puts(seq, " Outgoing: "); /* For out_nc_node to this orig_node */ list_for_each_entry_rcu(nc_node, &orig_node->out_coding_list, list) seq_printf(seq, "%pM ", nc_node->addr); - seq_printf(seq, "\n\n"); + seq_puts(seq, "\n\n"); } rcu_read_unlock(); } diff --git a/originator.c b/originator.c index 585e684..2f34525 100644 --- a/originator.c +++ b/originator.c @@ -465,7 +465,7 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset) neigh_node_tmp->tq_avg); } - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); batman_count++; next: @@ -475,7 +475,7 @@ next: } if (batman_count == 0) - seq_printf(seq, "No batman nodes in range ...\n"); + seq_puts(seq, "No batman nodes in range ...\n"); out: if (primary_if) diff --git a/vis.c b/vis.c index c053244..962ccf3 100644 --- a/vis.c +++ b/vis.c @@ -149,7 +149,7 @@ static void batadv_vis_data_read_prim_sec(struct seq_file *seq, hlist_for_each_entry(entry, if_list, list) { if (entry->primary) - seq_printf(seq, "PRIMARY, "); + seq_puts(seq, "PRIMARY, "); else seq_printf(seq, "SEC %pM, ", entry->addr); } @@ -207,7 +207,7 @@ static void batadv_vis_data_read_entries(struct seq_file *seq, if (batadv_compare_eth(entry->addr, packet->vis_orig)) batadv_vis_data_read_prim_sec(seq, list); - seq_printf(seq, "\n"); + seq_puts(seq, "\n"); } }

10 years

[batman-adv] next: batman-adv: fix old master freeing operation (9e96c4d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 9e96c4d373e45322d98ca177f7c4cc0b97f282d5 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Fri Mar 22 09:49:55 2013 +0100 batman-adv: fix old master freeing operation When a new hard_iface has a master already, ndo_del_slave has to be used in order to let the old master perform its cleaning up routine correctly. Unsetting the master iface only can lead to a inconsistent state in the master driver. Introduced by 5e57e3bff429cd403f0e30af69cf87a2cd55598f ("batman-adv: free an hard-interface before adding it"). Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- 9e96c4d373e45322d98ca177f7c4cc0b97f282d5 compat.h | 3 +++ hard-interface.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/compat.h b/compat.h index ba07ae4..0663df5 100644 --- a/compat.h +++ b/compat.h @@ -161,6 +161,9 @@ static const struct { \ } __attribute__((unused)) __useless_ops1 = { \ .ndo_validate_addr +#define ndo_del_slave ndo_init +#define ndo_init(x, y) ndo_init - master->netdev_ops->ndo_init - EBUSY + #endif /* < KERNEL_VERSION(2, 6, 39) */ diff --git a/hard-interface.c b/hard-interface.c index fd99e42..37c1b51 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -307,6 +307,30 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface) batadv_update_min_mtu(hard_iface->soft_iface); } +/** + * batadv_master_del_slave - remove hard_iface from the current master interface + * @slave: the interface enslaved in another master + * @master: the master from which slave has to be removed + * + * Invoke ndo_del_slave on master passing slave as argument. In this way slave + * is free'd and master can correctly change its internal state. + * Return 0 on success, a negative value representing the error otherwise + */ +static int batadv_master_del_slave(struct batadv_hard_iface *slave, + struct net_device *master) +{ + int ret; + + if (!master) + return 0; + + ret = -EBUSY; + if (master->netdev_ops->ndo_del_slave) + ret = master->netdev_ops->ndo_del_slave(master, slave->net_dev); + + return ret; +} + int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, const char *iface_name) { @@ -346,8 +370,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, * in that case unlink it first */ master = netdev_master_upper_dev_get(hard_iface->net_dev); - if (master) - netdev_upper_dev_unlink(hard_iface->net_dev, master); + ret = batadv_master_del_slave(hard_iface, master); + if (ret) + goto err_dev; hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface);

10 years

[linux-merge]linux integration; annotated tag, v3.9-rc4, created. v3.9-rc4

by postmaster＠open-mesh.org

The annotated tag, v3.9-rc4 has been created at d3318b414811d5393b4535ab6cb5aeddb57a4e5b (tag) tagging 8bb9660418e05bb1845ac1a2428444d78e322cc7 (commit) replaces v3.9-rc3 tagged by Linus Torvalds on Sat Mar 23 16:52:52 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.9-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRTkBaAAoJEHm+PkMAQRiGnK8H/iAtbU3o8th651xsVY/X1lTy uzFmZpfjwfM+OB5n69qcZL+V9I0b54ZKOa98OAtWlMPXifTWdznDNStqvQeRmodr Eet/W9MwgsaBDw+/vaJKuBf5ny3msayPSA1jkVAjb1VfpheH5zvLXNo1857FoSfi cl9jrD3tIrM6EmNwR+EWANjb1xYtJfnbtnF6xHpcEG64bcidEv8ZC7V48KNL16Dt Duy5+ZIsGoHsMj45y35KP032NtBpPvCmmXOjkO8fwwAwK+IvyivKJFfo3UlvmVdr seHQ5RgI/g0SCupLx6N4fBUNfYi/7yNn/ZAiNO06g0ErmOSs38KlRFDg63tLZ+g= =yJhy -----END PGP SIGNATURE----- Marek Lindner (1): batman-adv: verify tt len does not exceed packet len ----------------------------------------------------------------------- -- linux integration

10 years

[batmand] master: Either all or no source file should #define _GNU_SOURCE. (1e275d9)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batmand On branch : master >--------------------------------------------------------------- commit 1e275d939d45ecc1d96957a353dc639d28aefb52 Author: Elektra Wagenrad <onelektra(a)gmx.net> Date: Thu Mar 21 15:57:45 2013 +0100 Either all or no source file should #define _GNU_SOURCE. Thanks to Sven Eckelmann and Michael Tautschnig for reporting and fixing. Signed-off-by: Elektra Wagenrad <onelektra(a)gmx.net> >--------------------------------------------------------------- 1e275d939d45ecc1d96957a353dc639d28aefb52 Makefile | 1 + linux/route.c | 1 - posix/unix_socket.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fe1f094..ce1e198 100755 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ LINUX_OBJ = linux/route.o linux/tun.o linux/kernel.o ifeq ($(UNAME),Linux) OS_OBJ = $(LINUX_OBJ) $(POSIX_OBJ) +CPPFLAGS += -D_GNU_SOURCE endif OBJ = batman.o originator.o schedule.o list-batman.o allocate.o bitarray.o hash.o profile.o ring_buffer.o hna.o $(OS_OBJ) diff --git a/linux/route.c b/linux/route.c index 119ebb2..bceac95 100644 --- a/linux/route.c +++ b/linux/route.c @@ -21,7 +21,6 @@ -#define _GNU_SOURCE #include <sys/ioctl.h> #include <arpa/inet.h> /* inet_ntop() */ #include <errno.h> diff --git a/posix/unix_socket.c b/posix/unix_socket.c index 5bed217..02a0a3a 100644 --- a/posix/unix_socket.c +++ b/posix/unix_socket.c @@ -21,7 +21,6 @@ -#define _GNU_SOURCE #include <sys/time.h> #include <stdio.h> #include <fcntl.h>

10 years

[linux-merge]linux integration; branch, merge/master, updated. v3.9-rc1-1733-gb906204

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit b906204f0dfb5ff298d9499d8da3b26113eed90c Merge: 76b7062984256240ed73f97ef1b8fcc8dcd1c7a8 d4e5e0143fe81cfe804e753f9d7cc3d9e6447e86 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Mar 18 13:43:34 2013 +0100 Merge remote-tracking branch 'pkg/next' into merge/master Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Conflicts: net/batman-adv/compat.h diff --combined net/batman-adv/network-coding.c index 5728079,086c107..086c107 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@@ -654,7 -654,7 +654,7 @@@ static bool batadv_can_nc_with_orig(str struct batadv_orig_node *orig_node, struct batadv_ogm_packet *ogm_packet) { - if (orig_node->last_real_seqno != ogm_packet->seqno) + if (orig_node->last_real_seqno != ntohl(ogm_packet->seqno)) return false; if (orig_node->last_ttl != ogm_packet->header.ttl + 1) return false; diff --combined net/batman-adv/packet.h index a079958,a51ccfc..a51ccfc --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@@ -308,7 -308,7 +308,7 @@@ struct batadv_coded_packet uint8_t second_source[ETH_ALEN]; uint8_t second_orig_dest[ETH_ALEN]; __be32 second_crc; - uint16_t coded_len; + __be16 coded_len; }; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- linux integration

10 years

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2013