B.A.T.M.A.N December 2013

b.a.t.m.a.n@lists.open-mesh.org

12 participants
39 discussions

[B.A.T.M.A.N.] [PATCH 1/4] batman-adv: fix typ0 in sysfs.c

by Antonio Quartulli

Fix a small typ0 in sysfs.c. Introduced by 99a6eb50ef5066e125cedb97bc0fcfcdff4f08cc ("batman-adv: deselect current GW on client mode switch off") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysfs.c b/sysfs.c index 2f89a57..037f411 100644 --- a/sysfs.c +++ b/sysfs.c @@ -407,7 +407,7 @@ static ssize_t batadv_store_gw_mode(struct kobject *kobj, curr_gw_mode_str, buff); /* Invoking batadv_gw_reselect() is not enough to really de-select the - * current GW. It will only instruct the gateway clientcode to perform + * current GW. It will only instruct the gateway client code to perform * a re-election the next time that this is needed. * * When gw client mode is being switched off the current GW must be -- 1.8.5.1

9 years, 3 months

[B.A.T.M.A.N.] [PATCH] batman-adv fix FSF address

by Antonio Quartulli

Jeff Kirsher is patching most of the networking modules to accommodate this new policy for what concern the FSF address in the GPL license. However he is using a slightly different version than what we did. Since his changes have already been applied, fix our text to match what he proposed. Introduced by c2a8e168c0ae7d23803ff6a09d25a28dfaa57d58 ("batman-adv: remove FSF address from GPL disclaimer") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- Makefile | 3 +++ Makefile.kbuild | 3 +++ bat_algo.h | 3 +++ bat_iv_ogm.c | 3 +++ bitarray.c | 3 +++ bitarray.h | 3 +++ bridge_loop_avoidance.c | 3 +++ bridge_loop_avoidance.h | 3 +++ compat.c | 2 ++ compat.h | 2 ++ debugfs.c | 3 +++ debugfs.h | 3 +++ distributed-arp-table.c | 3 +++ distributed-arp-table.h | 3 +++ fragmentation.c | 3 +++ fragmentation.h | 3 +++ gateway_client.c | 3 +++ gateway_client.h | 3 +++ gateway_common.c | 3 +++ gateway_common.h | 3 +++ hard-interface.c | 3 +++ hard-interface.h | 3 +++ hash.c | 3 +++ hash.h | 3 +++ icmp_socket.c | 3 +++ icmp_socket.h | 3 +++ main.c | 3 +++ main.h | 3 +++ network-coding.c | 3 +++ network-coding.h | 3 +++ originator.c | 3 +++ originator.h | 3 +++ packet.h | 3 +++ routing.c | 3 +++ routing.h | 3 +++ send.c | 3 +++ send.h | 3 +++ soft-interface.c | 3 +++ soft-interface.h | 3 +++ sysfs.c | 3 +++ sysfs.h | 3 +++ translation-table.c | 3 +++ translation-table.h | 3 +++ types.h | 3 +++ 44 files changed, 130 insertions(+) diff --git a/Makefile b/Makefile index 66534b5..6edf514 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/>. +# # read README.external for more information about the configuration # B.A.T.M.A.N. debugging: diff --git a/Makefile.kbuild b/Makefile.kbuild index 989bf10..e595415 100644 --- a/Makefile.kbuild +++ b/Makefile.kbuild @@ -12,6 +12,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <http://www.gnu.org/licenses/>. +# obj-$(CONFIG_BATMAN_ADV) += batman-adv.o batman-adv-y += bat_iv_ogm.o diff --git a/bat_algo.h b/bat_algo.h index 3690692..92435bf 100644 --- a/bat_algo.h +++ b/bat_algo.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BAT_ALGO_H_ diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index b9aec98..3497712 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/bitarray.c b/bitarray.c index 6eed735..89d3a5b 100644 --- a/bitarray.c +++ b/bitarray.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/bitarray.h b/bitarray.h index 6f7e4f6..685e0af 100644 --- a/bitarray.h +++ b/bitarray.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BITARRAY_H_ diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 4382127..b164a07 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index c2e0c8c..377dae0 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_BLA_H_ diff --git a/compat.c b/compat.c index cebd800..4fca9e1 100644 --- a/compat.c +++ b/compat.c @@ -11,6 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * This file contains macros for maintaining compatibility with older versions * of the Linux kernel. diff --git a/compat.h b/compat.h index 6daeff9..8545b0a 100644 --- a/compat.h +++ b/compat.h @@ -11,6 +11,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. * * This file contains macros for maintaining compatibility with older versions * of the Linux kernel. diff --git a/debugfs.c b/debugfs.c index fcdb51b..26cbf34 100644 --- a/debugfs.c +++ b/debugfs.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/debugfs.h b/debugfs.h index f6e16f3..981794f 100644 --- a/debugfs.h +++ b/debugfs.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_DEBUGFS_H_ diff --git a/distributed-arp-table.c b/distributed-arp-table.c index f329af4..990c054 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/if_ether.h> diff --git a/distributed-arp-table.h b/distributed-arp-table.h index 698e13f..afa13ca 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ diff --git a/fragmentation.c b/fragmentation.c index 0dd09d4..8c3c151 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/fragmentation.h b/fragmentation.h index d9a97f3..0347f0c 100644 --- a/fragmentation.h +++ b/fragmentation.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_FRAGMENTATION_H_ diff --git a/gateway_client.c b/gateway_client.c index 5c66081..9ece204 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/gateway_client.h b/gateway_client.h index 8fab195..006befb 100644 --- a/gateway_client.h +++ b/gateway_client.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ diff --git a/gateway_common.c b/gateway_common.c index 60ddd7c..f76816c 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/gateway_common.h b/gateway_common.h index 49f5deb..c47b17a 100644 --- a/gateway_common.h +++ b/gateway_common.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_GATEWAY_COMMON_H_ diff --git a/hard-interface.c b/hard-interface.c index 3873175..3f0e41a 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/hard-interface.h b/hard-interface.h index f4a6022..ccd42c2 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_HARD_INTERFACE_H_ diff --git a/hash.c b/hash.c index 0470008..d9cfa03 100644 --- a/hash.c +++ b/hash.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/hash.h b/hash.h index 7030911..df5ece9 100644 --- a/hash.h +++ b/hash.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_HASH_H_ diff --git a/icmp_socket.c b/icmp_socket.c index 7e48d9e..d3fcd9f 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/icmp_socket.h b/icmp_socket.h index 10ba853..559e54a 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ diff --git a/main.c b/main.c index a7da5ea..3fc4a43 100644 --- a/main.c +++ b/main.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/crc32c.h> diff --git a/main.h b/main.h index d154d4d..2f3ac06 100644 --- a/main.h +++ b/main.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_MAIN_H_ diff --git a/network-coding.c b/network-coding.c index b2fde56..668c518 100644 --- a/network-coding.c +++ b/network-coding.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include <linux/debugfs.h> diff --git a/network-coding.h b/network-coding.h index b16639f..136db6d 100644 --- a/network-coding.h +++ b/network-coding.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_NETWORK_CODING_H_ diff --git a/originator.c b/originator.c index a001a3d..4af1c77 100644 --- a/originator.c +++ b/originator.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/originator.h b/originator.h index 39fa3b7..ad17c3c 100644 --- a/originator.h +++ b/originator.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_ORIGINATOR_H_ diff --git a/packet.h b/packet.h index 5f402c9..9b6c45b 100644 --- a/packet.h +++ b/packet.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_PACKET_H_ diff --git a/routing.c b/routing.c index 7aac5b3..773a452 100644 --- a/routing.c +++ b/routing.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/routing.h b/routing.h index 4143898..8fa23fc 100644 --- a/routing.h +++ b/routing.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_ROUTING_H_ diff --git a/send.c b/send.c index 4b6208c..6a713c8 100644 --- a/send.c +++ b/send.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/send.h b/send.h index 960015d..0b17f8d 100644 --- a/send.h +++ b/send.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_SEND_H_ diff --git a/soft-interface.c b/soft-interface.c index 450dd7c..a48e1e3 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/soft-interface.h b/soft-interface.h index 1e5846f..4ab0167 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ diff --git a/sysfs.c b/sysfs.c index 3347ffc..2f89a57 100644 --- a/sysfs.c +++ b/sysfs.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/sysfs.h b/sysfs.h index eb80ee0..ed80b72 100644 --- a/sysfs.h +++ b/sysfs.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_SYSFS_H_ diff --git a/translation-table.c b/translation-table.c index 3b13c63..6fbb6a0 100644 --- a/translation-table.c +++ b/translation-table.c @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "main.h" diff --git a/translation-table.h b/translation-table.h index 3ab8a7b..daa8ab7 100644 --- a/translation-table.h +++ b/translation-table.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ diff --git a/types.h b/types.h index 2627a3d..8a1fa16 100644 --- a/types.h +++ b/types.h @@ -10,6 +10,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef _NET_BATMAN_ADV_TYPES_H_ -- 1.8.5.1

9 years, 3 months

[B.A.T.M.A.N.] [PATCHv2 next] batadv: Slight optimization of batadv_compare_eth

by Antonio Quartulli

Use the newly added generic routine ether_addr_equal_unaligned to test if possibly unaligned to u16 Ethernet addresses are equal. This slightly improves comparison time for systems with CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. Signed-off-by: Joe Perches <joe(a)perches.com> [antonio(a)meshcoding.com: added compat code for linux <3.14] Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 6 ++++++ main.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index 04a2256..997b817 100644 --- a/compat.h +++ b/compat.h @@ -376,4 +376,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ }) #endif /* < KERNEL_VERSION(3, 11, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) + +#define ether_addr_equal_unaligned(_a, _b) (memcmp(_a, _b, ETH_ALEN) == 0) + +#endif /* < KERNEL_VERSION(3, 14, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index c5d6eb2..d4187ba 100644 --- a/main.h +++ b/main.h @@ -267,7 +267,7 @@ static inline void batadv_dbg(int type __always_unused, */ static inline int batadv_compare_eth(const void *data1, const void *data2) { - return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); + return ether_addr_equal_unaligned(data1, data2); } /** -- 1.8.5.1

9 years, 3 months

[B.A.T.M.A.N.] [PATCHv2 next - RESEND] batadv: Slight optimization of batadv_compare_eth

by Antonio Quartulli

9 years, 3 months

[B.A.T.M.A.N.] [PATCH maint] batman-adv: free nf_bridge member on locally delivered skb

by Antonio Quartulli

If an interface enslaved into batman-adv is a bridge (or a virtual interface built on top of a bridge) the nf_bridge member of the skbs reaching the soft-interface is filled with the state about "netfilter bridge" operations. Then, if one of such skbs is locally delivered, the nf_bridge member should be cleaned up to avoid that the old state could mess up with other "netfilter bridge" operations when entering a second bridge. This is needed because batman-adv is an encapsulation protocol. However at the moment skb->nf_bridge is not released at all leading to bogus "netfilter bridge" behaviours. Fix this by releasing skb->nf_bridge before an skb gets delivered to the upper layer in interface_rx(). Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- soft-interface.c | 8 ++++++++ soft-interface.h | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 33b6144..5dd1247 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -371,6 +371,14 @@ void batadv_interface_rx(struct net_device *soft_iface, if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) goto dropped; + /* Clean the netfilter state before delivering the skb. + * This packet may have traversed a bridge when it was encapsulated into + * the batman header. Now that the header has been removed, the + * netfilter state must be cleaned up to avoid to mess up with a + * possible second bridge + */ + batadv_nf_bridge_skb_free(skb); + netif_rx(skb); goto out; diff --git a/soft-interface.h b/soft-interface.h index 2f2472c..5c19c42 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -29,4 +29,20 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; +#ifdef CONFIG_BRIDGE_NETFILTER +/** + * batadv_nf_bridge_skb_free - clean the NF bridge data in an skb + * @skb: the skb which nf data has to be free'd + */ +static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) +{ + nf_bridge_put(skb->nf_bridge); + skb->nf_bridge = NULL; +} +#else +static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) +{ +} +#endif /* CONFIG_BRIDGE_NETFILTER */ + #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */ -- 1.8.5.1

9 years, 3 months

[B.A.T.M.A.N.] [PATCH] batadv: Slight optimization of batadv_compare_eth

by Antonio Quartulli

Use the newly added generic routine ether_addr_equal_unaligned to test if possibly unaligned to u16 Ethernet addresses are equal. This slightly improves comparison time for systems with CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. Signed-off-by: Joe Perches <joe(a)perches.com> [antonio(a)meshcoding.com: added compat code for linux <3.14] Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- compat.h | 6 ++++++ main.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index 8545b0a..a1c8396 100644 --- a/compat.h +++ b/compat.h @@ -382,4 +382,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ }) #endif /* < KERNEL_VERSION(3, 11, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) + +#define ether_addr_equal_unaligned(_a, _b) (memcmp(_a, _b, ETH_ALEN) == 0) + +#endif /* < KERNEL_VERSION(3, 14, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index 2f3ac06..d636449 100644 --- a/main.h +++ b/main.h @@ -273,7 +273,7 @@ static inline void batadv_dbg(int type __always_unused, */ static inline int batadv_compare_eth(const void *data1, const void *data2) { - return memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0; + return ether_addr_equal_unaligned(data1, data2); } /** -- 1.8.5.1

9 years, 3 months

[B.A.T.M.A.N.] [PATCH -next] batadv: Slight optimization of batadv_compare_eth

by Joe Perches

Use CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS to check if this function can be optimized by using the generic ether_addr_equal. Remove the unnecessary ?: after the unoptimized memcmp. Signed-off-by: Joe Perches <joe(a)perches.com> --- net/batman-adv/main.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index f94f287b..74a7a3f 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -266,7 +266,11 @@ static inline void batadv_dbg(int type __always_unused, */ static inline int batadv_compare_eth(const void *data1, const void *data2) { - return (memcmp(data1, data2, ETH_ALEN) == 0 ? 1 : 0); +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) + return ether_addr_equal(data1, data2); +#else + return memcmp(data1, data2, ETH_ALEN) == 0; +#endif } /**

9 years, 3 months

[B.A.T.M.A.N.] [PATCH] Fix ARM BUILD_BUG_ON() errors with batman-adv

by Russell King - ARM Linux

From: Russell King <rmk+kernel(a)arm.linux.org.uk> The following errors were observed on ARM during a randconfig build. This patch addresses them by ensuring that the batadv_header structure is appropriately packed; this structure contains three 8-bit elements so there should be no undesired side effect from this packing. net/batman-adv/main.c: In function 'batadv_init': net/batman-adv/main.c:425:279: error: call to '__compiletime_assert_425' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_unicast_4addr_packet, src) != 10 net/batman-adv/main.c:426:267: error: call to '__compiletime_assert_426' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_unicast_packet, dest) != 4 net/batman-adv/main.c:427:275: error: call to '__compiletime_assert_427' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_unicast_tvlv_packet, dst) != 4 net/batman-adv/main.c:428:261: error: call to '__compiletime_assert_428' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_frag_packet, dest) != 4 net/batman-adv/main.c:429:271: error: call to '__compiletime_assert_429' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_icmp_packet, icmph.dst) != 4 net/batman-adv/main.c:430:277: error: call to '__compiletime_assert_430' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct batadv_icmp_packet_rr, icmph.dst) != 4 Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> --- net/batman-adv/packet.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 207459b62966..4039f25794e0 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -171,7 +171,7 @@ struct batadv_header { /* the parent struct has to add a byte after the header to make * everything 4 bytes aligned again */ -}; +} __attribute__((packed)); /** * struct batadv_ogm_packet - ogm (routing protocol) packet

9 years, 3 months

Re: [B.A.T.M.A.N.] Loss of connection to remote nodes, from clients only.

by tjhowse

I can't say which version for certain right now - I'll check when I'm back at work on Monday - but it was the latest available from the barrier_breaker sources as of approximately two weeks ago. On 1 December 2013 09:19, tjhowse <tjhowse(a)gmail.com> wrote: > I can't say which version for certain right now - I'll check when I'm back > at work on Monday - but it was the latest available from the barrier_breaker > sources as of approximately two weeks ago. > > > On 30 November 2013 13:35, Gui Iribarren <gui(a)altermundi.net> wrote: >> >> On 11/24/2013 08:36 PM, tjhowse wrote: >>> >>> In my test system I have 11 dual-channel nodes. The 5GHz link is used >>> for interconnect between the nodes and the 2.4GHz link is for clients. >>> One of the nodes is distant. My laptop is connected to a common-SSID >>> AP link from one of the local nodes. I can always ping the distant >>> node from one of the local nodes, but the link from my laptop is less >>> reliable. I can have an SSH session open to the distant node and a >>> local node, pinging the distant node from both the local node and my >>> laptop. At no particular point the distant node will stop pinging from >>> my laptop and its SSH session will drop, while the ping continues just >>> fine from the local node. >>> >>> The connection can restore equally mysteriously. >>> >>> Can anyone explain this behavior? No manual network configuration >>> changes are being made at the point at which the connection drops or >>> is restored, though I suppose my laptop could be hopping between one >>> of the local APs. I am pinging an IP attached to the bridge joining >>> bat0, the copper node LAN and the 2.4GHz client LAN. >> >> >> Which batman-adv version are you using? >> >> i've seen a similar behaviour on 2013.1.0 and 2013.2.0, related to TTVN, >> but never collected data clean enough to report it, and then 2013.4.0 came >> out. >> i'll test this week 2013.4.0 to see if it's still an issue. >> >

9 years, 3 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N December 2013