commits March 2014

commits@lists.open-mesh.org

1 participants
69 discussions

[batman-adv] master: batman-adv: improve the TT flags documentation (6b65d96)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 6b65d962d6ad84d2d70e96ea98c4fd6518aec24f Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Sat Feb 22 16:48:14 2014 +0100 batman-adv: improve the TT flags documentation Convert the current documentation for the TT flags in proper kerneldoc and improve it by adding an explanation for each of the flags. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 6b65d962d6ad84d2d70e96ea98c4fd6518aec24f packet.h | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/packet.h b/packet.h index c7f6eef..34e096d 100644 --- a/packet.h +++ b/packet.h @@ -119,10 +119,30 @@ enum batadv_tt_data_flags { BATADV_TT_FULL_TABLE = BIT(4), }; -/* BATADV_TT_CLIENT flags. - * Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to - * BIT(15) are used for local computation only. - * Flags from BIT(4) to BIT(7) are kept in sync with the rest of the network. +/** + * enum batadv_tt_client_flags - TT client specific flags + * @BATADV_TT_CLIENT_DEL: the client has to be deleted from the table + * @BATADV_TT_CLIENT_ROAM: the client roamed to/from another node and the new + * update telling its new real location has not been received/sent yet + * @BATADV_TT_CLIENT_WIFI: this client is connected through a wifi interface. + * This information is used by the "AP Isolation" feature + * @BATADV_TT_CLIENT_ISOLA: this client is considered "isolated". This + * information is used by the Extended Isolation feature + * @BATADV_TT_CLIENT_NOPURGE: this client should never be removed from the table + * @BATADV_TT_CLIENT_NEW: this client has been added to the local table but has + * not been announced yet + * @BATADV_TT_CLIENT_PENDING: this client is marked for removal but it is kept + * in the table for one more originator interval for consistency purposes + * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be part of + * the network but no nnode has already announced it + * + * Bits from 0 to 7 are called _remote flags_ because they are sent on the wire. + * Bits from 8 to 15 are called _local flags_ because they are used for local + * computations only. + * + * Bits from 4 to 7 - a subset of remote flags - are ensured to be in sync with + * the other nodes in the network. To achieve this goal these flags are included + * in the TT CRC computation. */ enum batadv_tt_client_flags { BATADV_TT_CLIENT_DEL = BIT(0),

1 0

[batman-adv] master: batman-adv: properly align constant assignments (c77850c)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c77850c50336970faff45cf30907d1cd6ee72ed6 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat Feb 22 16:20:06 2014 +0100 batman-adv: properly align constant assignments All the assignments in packet.h are properly aligned. Also the multicast constants have to have a similar shape. Introduced by 1c090349e2f65d19a7f356cc0b61f13644c53bb6 ("batman-adv: Add IPv4 link-local/IPv6-ll-all-nodes multicast support") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- c77850c50336970faff45cf30907d1cd6ee72ed6 packet.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packet.h b/packet.h index feaa336..c7f6eef 100644 --- a/packet.h +++ b/packet.h @@ -97,9 +97,9 @@ enum batadv_icmp_packettype { * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets */ enum batadv_mcast_flags { - BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), - BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), - BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), + BATADV_MCAST_WANT_ALL_UNSNOOPABLES = BIT(0), + BATADV_MCAST_WANT_ALL_IPV4 = BIT(1), + BATADV_MCAST_WANT_ALL_IPV6 = BIT(2), }; /* tt data subtypes */

1 0

[batman-adv] master: batman-adv: use the name of the array as pointer (f5129b2)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f5129b218e55fa9afe43499a5aee7fdb0f99fd71 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Feb 26 14:13:32 2014 +0100 batman-adv: use the name of the array as pointer Introduced by fb4756fe5f6e58ca2ab208ca634ae4c8dd6e9499 ("batman-adv: use ether_addr_copy instead of memcpy in multicast code") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f5129b218e55fa9afe43499a5aee7fdb0f99fd71 multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index e69143b..998b429 100644 --- a/multicast.c +++ b/multicast.c @@ -45,7 +45,7 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, break; } - ether_addr_copy(&new->addr, &mc_list_entry->addr); + ether_addr_copy(new->addr, mc_list_entry->addr); hlist_add_head(&new->list, mcast_list); ret++; }

1 0

[batman-adv] master: batman-adv: use the proper location in ether_addr_copy() (3b8bd3d)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3b8bd3d7a9363dd14e79cb2937338627edd900f1 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Wed Feb 26 14:10:42 2014 +0100 batman-adv: use the proper location in ether_addr_copy() Introduced by: 513b2d107a4d88f62b9394926e377d2c6250775f ("batman-adv: prefer ether_addr_copy to memcpy") Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3b8bd3d7a9363dd14e79cb2937338627edd900f1 icmp_socket.c | 2 +- routing.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icmp_socket.c b/icmp_socket.c index bf07dfd..161ef8f 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -230,7 +230,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmp_header; if (packet_len == sizeof(*icmp_packet_rr)) { addr = neigh_node->if_incoming->net_dev->dev_addr; - ether_addr_copy(icmp_packet_rr->rr, addr); + ether_addr_copy(icmp_packet_rr->rr[0], addr); } break; diff --git a/routing.c b/routing.c index 3855132..3514153 100644 --- a/routing.c +++ b/routing.c @@ -340,7 +340,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (icmp_packet_rr->rr_cur >= BATADV_RR_LEN) goto out; - ether_addr_copy(&(icmp_packet_rr->rr[icmp_packet_rr->rr_cur]), + ether_addr_copy(icmp_packet_rr->rr[icmp_packet_rr->rr_cur], ethhdr->h_dest); icmp_packet_rr->rr_cur++; }

1 0

[batctl] master: Merge branch 'next' (a71b546)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit a71b54603d974c4afc5e4d9d18cd1186da04d668 Merge: 49cc660 6b36552 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Mar 11 17:48:52 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- a71b54603d974c4afc5e4d9d18cd1186da04d668 README | 13 +++++++++++++ man/batctl.8 | 20 ++++++++++++++++++++ sys.c | 9 +++++++-- sys.h | 1 + 4 files changed, 41 insertions(+), 2 deletions(-)

1 0

[batctl] master's head updated: Merge branch 'next' (a71b546)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 6b36552 batctl: add isolation_mark support a71b546 Merge branch 'next'

1 0

[batctl] next: batctl: add isolation_mark support (6b36552)
by postmaster＠open-mesh.org 11 Mar '14

11 Mar '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 6b3655224ec7ab9d8fe7812d17c057ba5fd3b4ca Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Tue Feb 25 14:59:44 2014 +0100 batctl: add isolation_mark support With this patch it is now possible to set/unset the value of the isolation_mark used by the Extended Isolation feature in batman-adv. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 6b3655224ec7ab9d8fe7812d17c057ba5fd3b4ca README | 13 +++++++++++++ man/batctl.8 | 20 ++++++++++++++++++++ sys.c | 9 +++++++-- sys.h | 1 + 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/README b/README index 5af95c8..a4507b7 100644 --- a/README +++ b/README @@ -399,6 +399,19 @@ display or modify the packet aggregation setting Usage: batctl aggregation|ag [0|1] +batctl isolation_mark +===================== + +display or modify the isolation mark. +This value is used by Extended Isolation feature. + +Usage: batctl isolation_mark|mark $value[/0x$mask] + +Example 1: batctl mark 0x00000001/0xffffffff +Example 2: batctl mark 0x00040000/0xffff0000 +Example 3: batctl mark 16 +Example 4: batctl mark 0x0f + batctl translocal ================= diff --git a/man/batctl.8 b/man/batctl.8 index 2fe5941..b808293 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -151,6 +151,26 @@ least XX TQ better than the currently selected gateway (XX has to be a number be .RE .RE .br +.IP "\fBisolation_mark\fP|\fBmark\fP" +If no parameter is given the current isolation mark value is displayed. +Otherwise the parameter is used to set or unset the isolation mark used by the +Extended Isolation feature. +.br +The input is supposed to be of the form $value/$mask, where $value can be any +32bit long integer (expressed in decimal or hex base) and $mask is a generic +bitmask (expressed in hex base) that selects the bits to take into consideration +from $value. It is also possible to enter the input using only $value and in +this case the full bitmask is used by default. + +.br +.br +Example 1: 0x00000001/0xffffffff +.br +Example 2: 0x00040000/0xffff0000 +.br +Example 3: 16 or 0x0F +.br +.br .PP .I \fBdebug tables: .IP diff --git a/sys.c b/sys.c index 5cebf52..fd6e107 100644 --- a/sys.c +++ b/sys.c @@ -96,8 +96,13 @@ const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM] = { .opt_short = "nc", .sysfs_name = "network_coding", .params = sysfs_param_enable, - } - + }, + { + .opt_long = "isolation_mark", + .opt_short = "mark", + .sysfs_name = "isolation_mark", + .params = NULL, + }, }; static void interface_usage(void) diff --git a/sys.h b/sys.h index 2cbbcfb..5633822 100644 --- a/sys.h +++ b/sys.h @@ -46,6 +46,7 @@ enum batctl_settings_list { BATCTL_SETTINGS_BONDING, BATCTL_SETTINGS_FRAGMENTATION, BATCTL_SETTINGS_NETWORK_CODING, + BATCTL_SETTINGS_ISOLATION_MARK, BATCTL_SETTINGS_NUM, };

1 0

[linux-merge]linux integration; annotated tag, v3.14-rc6, created. v3.14-rc6
by postmaster＠open-mesh.org 10 Mar '14

10 Mar '14

The annotated tag, v3.14-rc6 has been created at 4a5d07cddee1adcf08db8036f32062912ae8654b (tag) tagging fa389e220254c69ffae0d403eac4146171062d08 (commit) replaces v3.14-rc5 tagged by Linus Torvalds on Sun Mar 9 19:42:25 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.14-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTHSaRAAoJEHm+PkMAQRiG7G8IAJHElwFDNSQE7Y9MmbicrAMG kfjhBtBpTaVrJKQXegCNUwDaLLyC4oLIxDheW84oPXbrEGDLqPtBov/hrcFkHVr4 lh/ZYk02nYtcfpN0JnL/Yj2oKHVmBWs0vFlM7StSFsJCj10DoCVQQdmAJ8XODTPo CXMapk+UikTX1TlIO8+B5toyl3R1OqPmW211UV1vQVLKy66hu+MKVN/V+/EyopL0 1jO81EDpaRaeIJh1/okcyUoIq9pqLkAWNpeQ7uyXZ+Sfivt9RXwLYKmAB3lP20Hc ZMIIoHSCyYRFjxLlQvt02bA9nY4wTY7YN5kZ2kk65y7TFfhcGsCw1Sc69iyCoKs= =CJcA -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.14-rc5, created. v3.14-rc5
by postmaster＠open-mesh.org 03 Mar '14

03 Mar '14

The annotated tag, v3.14-rc5 has been created at 5b2ddfdea1e0dc3e0ce8c427b187a86ba12c1e01 (tag) tagging 0414855fdc4a40da05221fc6062cccbc0c30f169 (commit) replaces v3.14-rc4 tagged by Linus Torvalds on Sun Mar 2 18:56:23 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.14-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTE+9XAAoJEHm+PkMAQRiGrMQIAKI2V49Kj8WlnwGchFvsbGJB SLALwNi33T/IBKdZRhrfryBu02Zj7eVvZ2ML35dJEnmF88O+dJBDMTkKV1xalrip mtkBrjUnfAI04fq/daLQ1TsAy4qqlra5tSTuDCw8ILOnGPwT0VydIEHNdtmoUIfw xlZLxHzny1MslZ78d7uR/cUnV9ylKRRajWzfw1HT8hL51fCt8nRWY0sCvwvl+kMJ LsK+6I7mHDUuzA7QBmBI+dhzQgos5+JkkrnpmqHAqwmIh+AI3ksmjUCQ4dM7owrO IvEx+ZNDqxAdLcm1WAxATNfxddFXHc62JTvKuuKqTVWuaxVfK1Aqt8MjDMIPeAQ= =yV5u -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2014