commits

commits@lists.open-mesh.org

1 participants
12425 discussions

[batman-adv] master: batman-adv: Remove kernel fixed width types in packet.h (d635e801)
by postmaster＠open-mesh.org 21 Dec '17

21 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d635e801f43c80a4260574aadf34cceedc4f8a03 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Sat Dec 16 10:27:54 2017 +0100 batman-adv: Remove kernel fixed width types in packet.h The uapi headers use the __u8/__u16/... version of the fixed width types instead of u8/u16/... The use of the latter must be avoided before packet.h is copied to include/uapi/linux/. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> >--------------------------------------------------------------- d635e801f43c80a4260574aadf34cceedc4f8a03 net/batman-adv/packet.h | 214 ++++++++++++++++++++++++------------------------ 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 44f20d03..3b2d2db9 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -29,7 +29,7 @@ * * Return: 0 when not error was detected, != 0 otherwise */ -#define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0) +#define batadv_tp_is_error(n) ((__u8)(n) > 127 ? 1 : 0) /** * enum batadv_packettype - types for batman-adv encapsulated packets @@ -191,8 +191,8 @@ enum batadv_tvlv_type { * transport the claim type and the group id */ struct batadv_bla_claim_dst { - u8 magic[3]; /* FF:43:05 */ - u8 type; /* bla_claimframe */ + __u8 magic[3]; /* FF:43:05 */ + __u8 type; /* bla_claimframe */ __be16 group; /* group id */ }; @@ -212,15 +212,15 @@ struct batadv_bla_claim_dst { * @tvlv_len: length of tvlv data following the ogm header */ struct batadv_ogm_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 flags; __be32 seqno; - u8 orig[ETH_ALEN]; - u8 prev_sender[ETH_ALEN]; - u8 reserved; - u8 tq; + __u8 orig[ETH_ALEN]; + __u8 prev_sender[ETH_ALEN]; + __u8 reserved; + __u8 tq; __be16 tvlv_len; /* __packed is not needed as the struct size is divisible by 4, * and the largest data type in this struct has a size of 4. @@ -241,12 +241,12 @@ struct batadv_ogm_packet { * @throughput: the currently flooded path throughput */ struct batadv_ogm2_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 flags; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 flags; __be32 seqno; - u8 orig[ETH_ALEN]; + __u8 orig[ETH_ALEN]; __be16 tvlv_len; __be32 throughput; /* __packed is not needed as the struct size is divisible by 4, @@ -265,9 +265,9 @@ struct batadv_ogm2_packet { * @elp_interval: currently used ELP sending interval in ms */ struct batadv_elp_packet { - u8 packet_type; - u8 version; - u8 orig[ETH_ALEN]; + __u8 packet_type; + __u8 version; + __u8 orig[ETH_ALEN]; __be32 seqno; __be32 elp_interval; }; @@ -290,14 +290,14 @@ struct batadv_elp_packet { * members are padded the same way as they are in real packets. */ struct batadv_icmp_header { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 align[3]; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 msg_type; /* see ICMP message types above */ + __u8 dst[ETH_ALEN]; + __u8 orig[ETH_ALEN]; + __u8 uid; + __u8 align[3]; }; /** @@ -313,14 +313,14 @@ struct batadv_icmp_header { * @seqno: ICMP sequence number */ struct batadv_icmp_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 reserved; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 msg_type; /* see ICMP message types above */ + __u8 dst[ETH_ALEN]; + __u8 orig[ETH_ALEN]; + __u8 uid; + __u8 reserved; __be16 seqno; }; @@ -342,15 +342,15 @@ struct batadv_icmp_packet { * store it using network order */ struct batadv_icmp_tp_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 subtype; - u8 session[2]; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 msg_type; /* see ICMP message types above */ + __u8 dst[ETH_ALEN]; + __u8 orig[ETH_ALEN]; + __u8 uid; + __u8 subtype; + __u8 session[2]; __be32 seqno; __be32 timestamp; }; @@ -381,16 +381,16 @@ enum batadv_icmp_tp_subtype { * @rr: route record array */ struct batadv_icmp_packet_rr { - u8 packet_type; - u8 version; - u8 ttl; - u8 msg_type; /* see ICMP message types above */ - u8 dst[ETH_ALEN]; - u8 orig[ETH_ALEN]; - u8 uid; - u8 rr_cur; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 msg_type; /* see ICMP message types above */ + __u8 dst[ETH_ALEN]; + __u8 orig[ETH_ALEN]; + __u8 uid; + __u8 rr_cur; __be16 seqno; - u8 rr[BATADV_RR_LEN][ETH_ALEN]; + __u8 rr[BATADV_RR_LEN][ETH_ALEN]; }; #define BATADV_ICMP_MAX_PACKET_SIZE sizeof(struct batadv_icmp_packet_rr) @@ -416,11 +416,11 @@ struct batadv_icmp_packet_rr { * @dest: originator destination of the unicast packet */ struct batadv_unicast_packet { - u8 packet_type; - u8 version; - u8 ttl; - u8 ttvn; /* destination translation table version number */ - u8 dest[ETH_ALEN]; + __u8 packet_type; + __u8 version; + __u8 ttl; + __u8 ttvn; /* destination translation table version number */ + __u8 dest[ETH_ALEN]; /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ @@ -435,9 +435,9 @@ struct batadv_unicast_packet { */ struct batadv_unicast_4addr_packet { struct batadv_unicast_packet u; - u8 src[ETH_ALEN]; - u8 subtype; - u8 reserved; + __u8 src[ETH_ALEN]; + __u8 subtype; + __u8 reserved; /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ @@ -457,22 +457,22 @@ struct batadv_unicast_4addr_packet { * @total_size: size of the merged packet */ struct batadv_frag_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; + __u8 packet_type; + __u8 version; /* batman version field */ + __u8 ttl; #if defined(__BIG_ENDIAN_BITFIELD) - u8 no:4; - u8 priority:3; - u8 reserved:1; + __u8 no:4; + __u8 priority:3; + __u8 reserved:1; #elif defined(__LITTLE_ENDIAN_BITFIELD) - u8 reserved:1; - u8 priority:3; - u8 no:4; + __u8 reserved:1; + __u8 priority:3; + __u8 no:4; #else #error "unknown bitfield endianness" #endif - u8 dest[ETH_ALEN]; - u8 orig[ETH_ALEN]; + __u8 dest[ETH_ALEN]; + __u8 orig[ETH_ALEN]; __be16 seqno; __be16 total_size; }; @@ -487,12 +487,12 @@ struct batadv_frag_packet { * @orig: originator of the broadcast packet */ struct batadv_bcast_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; - u8 reserved; + __u8 packet_type; + __u8 version; /* batman version field */ + __u8 ttl; + __u8 reserved; __be32 seqno; - u8 orig[ETH_ALEN]; + __u8 orig[ETH_ALEN]; /* "4 bytes boundary + 2 bytes" long to make the payload after the * following ethernet header again 4 bytes boundary aligned */ @@ -516,19 +516,19 @@ struct batadv_bcast_packet { * @coded_len: length of network coded part of the payload */ struct batadv_coded_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; - u8 first_ttvn; - /* u8 first_dest[ETH_ALEN]; - saved in mac header destination */ - u8 first_source[ETH_ALEN]; - u8 first_orig_dest[ETH_ALEN]; + __u8 packet_type; + __u8 version; /* batman version field */ + __u8 ttl; + __u8 first_ttvn; + /* __u8 first_dest[ETH_ALEN]; - saved in mac header destination */ + __u8 first_source[ETH_ALEN]; + __u8 first_orig_dest[ETH_ALEN]; __be32 first_crc; - u8 second_ttl; - u8 second_ttvn; - u8 second_dest[ETH_ALEN]; - u8 second_source[ETH_ALEN]; - u8 second_orig_dest[ETH_ALEN]; + __u8 second_ttl; + __u8 second_ttvn; + __u8 second_dest[ETH_ALEN]; + __u8 second_source[ETH_ALEN]; + __u8 second_orig_dest[ETH_ALEN]; __be32 second_crc; __be16 coded_len; }; @@ -547,14 +547,14 @@ struct batadv_coded_packet { * @align: 2 bytes to align the header to a 4 byte boundary */ struct batadv_unicast_tvlv_packet { - u8 packet_type; - u8 version; /* batman version field */ - u8 ttl; - u8 reserved; - u8 dst[ETH_ALEN]; - u8 src[ETH_ALEN]; + __u8 packet_type; + __u8 version; /* batman version field */ + __u8 ttl; + __u8 reserved; + __u8 dst[ETH_ALEN]; + __u8 src[ETH_ALEN]; __be16 tvlv_len; - u16 align; + __u16 align; }; /** @@ -564,8 +564,8 @@ struct batadv_unicast_tvlv_packet { * @len: tvlv container length */ struct batadv_tvlv_hdr { - u8 type; - u8 version; + __u8 type; + __u8 version; __be16 len; }; @@ -588,8 +588,8 @@ struct batadv_tvlv_gateway_data { * one batadv_tvlv_tt_vlan_data object per announced vlan */ struct batadv_tvlv_tt_data { - u8 flags; - u8 ttvn; + __u8 flags; + __u8 ttvn; __be16 num_vlan; }; @@ -603,7 +603,7 @@ struct batadv_tvlv_tt_data { struct batadv_tvlv_tt_vlan_data { __be32 crc; __be16 vid; - u16 reserved; + __u16 reserved; }; /** @@ -615,9 +615,9 @@ struct batadv_tvlv_tt_vlan_data { * @vid: VLAN identifier */ struct batadv_tvlv_tt_change { - u8 flags; - u8 reserved[3]; - u8 addr[ETH_ALEN]; + __u8 flags; + __u8 reserved[3]; + __u8 addr[ETH_ALEN]; __be16 vid; }; @@ -627,7 +627,7 @@ struct batadv_tvlv_tt_change { * @vid: VLAN identifier */ struct batadv_tvlv_roam_adv { - u8 client[ETH_ALEN]; + __u8 client[ETH_ALEN]; __be16 vid; }; @@ -637,8 +637,8 @@ struct batadv_tvlv_roam_adv { * @reserved: reserved field */ struct batadv_tvlv_mcast_data { - u8 flags; - u8 reserved[3]; + __u8 flags; + __u8 reserved[3]; }; #endif /* _NET_BATMAN_ADV_PACKET_H_ */

1 0

[batman-adv] master: batman-adv: Remove usage of BIT(x) in packet.h (5cecad64)
by postmaster＠open-mesh.org 21 Dec '17

21 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5cecad640a69cbd4b3d40c7f6a10797f57f7c606 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:17:28 2017 +0100 batman-adv: Remove usage of BIT(x) in packet.h The BIT(x) macro is no longer available for uapi headers because it is defined outside of it (linux/bitops.h). The use of it must therefore be avoided and replaced by an appropriate other representation. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> >--------------------------------------------------------------- 5cecad640a69cbd4b3d40c7f6a10797f57f7c606 net/batman-adv/packet.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 6b656386..44f20d03 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -20,7 +20,6 @@ #define _NET_BATMAN_ADV_PACKET_H_ #include <asm/byteorder.h> -#include <linux/bitops.h> #include <linux/if_ether.h> #include <linux/types.h> @@ -92,9 +91,9 @@ enum batadv_subtype { * one hop neighbor on the interface where it was originally received. */ enum batadv_iv_flags { - BATADV_NOT_BEST_NEXT_HOP = BIT(0), - BATADV_PRIMARIES_FIRST_HOP = BIT(1), - BATADV_DIRECTLINK = BIT(2), + BATADV_NOT_BEST_NEXT_HOP = 1UL << 0, + BATADV_PRIMARIES_FIRST_HOP = 1UL << 1, + BATADV_DIRECTLINK = 1UL << 2, }; /** @@ -123,9 +122,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 = 1UL << 0, + BATADV_MCAST_WANT_ALL_IPV4 = 1UL << 1, + BATADV_MCAST_WANT_ALL_IPV6 = 1UL << 2, }; /* tt data subtypes */ @@ -139,10 +138,10 @@ enum batadv_mcast_flags { * @BATADV_TT_FULL_TABLE: contains full table to replace existing table */ enum batadv_tt_data_flags { - BATADV_TT_OGM_DIFF = BIT(0), - BATADV_TT_REQUEST = BIT(1), - BATADV_TT_RESPONSE = BIT(2), - BATADV_TT_FULL_TABLE = BIT(4), + BATADV_TT_OGM_DIFF = 1UL << 0, + BATADV_TT_REQUEST = 1UL << 1, + BATADV_TT_RESPONSE = 1UL << 2, + BATADV_TT_FULL_TABLE = 1UL << 4, }; /** @@ -150,7 +149,7 @@ enum batadv_tt_data_flags { * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not */ enum batadv_vlan_flags { - BATADV_VLAN_HAS_TAG = BIT(15), + BATADV_VLAN_HAS_TAG = 1UL << 15, }; /**

1 0

[batman-adv] master: batman-adv: Let packet.h include its headers directly (560fdd8c)
by postmaster＠open-mesh.org 21 Dec '17

21 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 560fdd8c2c0f78a5885669539f1dfc48d7307ec8 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 11:39:29 2017 +0100 batman-adv: Let packet.h include its headers directly The headers used by packet.h should also be included by it directly. main.h is currently dealing with it in batman-adv, but this will no longer work when this header is moved to include/uapi/linux/. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> >--------------------------------------------------------------- 560fdd8c2c0f78a5885669539f1dfc48d7307ec8 net/batman-adv/main.h | 2 -- net/batman-adv/packet.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 5ac86df4..d5484ac3 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -217,10 +217,8 @@ enum batadv_uev_type { /* Kernel headers */ -#include <linux/bitops.h> /* for packet.h */ #include <linux/compiler.h> #include <linux/etherdevice.h> -#include <linux/if_ether.h> /* for packet.h */ #include <linux/if_vlan.h> #include <linux/jiffies.h> #include <linux/percpu.h> diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index dccbd4a6..6b656386 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h @@ -20,6 +20,8 @@ #define _NET_BATMAN_ADV_PACKET_H_ #include <asm/byteorder.h> +#include <linux/bitops.h> +#include <linux/if_ether.h> #include <linux/types.h> /**

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20171220, created. batadv-next-for-davem-20171220
by postmaster＠open-mesh.org 20 Dec '17

20 Dec '17

The annotated tag, batadv-next-for-davem-20171220 has been created at 53e22f0eeaa01a33e977e51e40c910d035fae85d (tag) tagging ff15c27c97303fbe5abc49c25c73ea299ab72d31 (commit) replaces v4.15-rc1 tagged by Simon Wunderlich on Wed Dec 20 11:56:56 2017 +0100 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - de-inline hash functions to save memory footprint, by Denys Vlasenko - Add License information to various files, by Sven Eckelmann (3 patches) - Change batman_adv.h from ISC to MIT, by Sven Eckelmann - Improve various includes, by Sven Eckelmann (5 patches) - Lots of kernel-doc work by Sven Eckelmann (8 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlo6QfgWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeobWfEADPEOdxWS7nW4Xkhug+7vLbcloJ Om1VDKFD4n5NfB6e+vh8kQAnnnQ/LzFSv53giNdnjjE9IPNKxNhzBQFS95H189EP ebP0mKOesTadkTx+MjFxenhnaTnzK0hkngdxz/frvaq+i6ECMhnq8Bw0elVG0nSg X9ts0x6BuNIw6EjIdPP0GvfOV1DvUmdMz1YLJy4yoJ8Tm671y86y07jTJaaEN2Ex 9dp0j3hEqtrYZvgRdQ/hzYLFJ9fvcF1FyA+duufK3FNbkJtZn89zqseIuN2saqqw QN/nDBrduzW6SR9y0JfXlatI6FN6316jskLcpqorz5/88KrwQeTOg2ZXXn0iw6l1 r0tkBP5/eEu2Dcd3WRsNtTnMZmGfc2uuqmvD1Pz0wN7RAzIYhPvs9to6TVy3mK5p 0OyFJaZU9vurtIPqVYjNtSofkUHKMOZZ1H7LocWaINGIVsREx/i0DmX//M0ZiqbB mS4ybkn8yOYfFUizg51RYo2nKVyw/ZXNqBYBPUWio91CPj0vOUFitvfxnxNitV/m 182HVdoOnGhorYbS3J/8Su3AyEyhJTVWnmq0z3u1CuvdMhppbAzvXvmERotAJN9e 5Wp26PE2a7zb4LJhMBQ4q+RnUnZV5ADhigrIEGPOQoY5KdIrEOcW65wrgfhWYlER NVJc2okVZKhg3o7amA== =5JUK -----END PGP SIGNATURE----- Denys Vlasenko (1): batman-adv: Deinline batadv_orig_hash_find, save 7339 bytes Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (15): batman-adv: Add SPDX license identifier above copyright header batman-adv: Add license header to Kconfig batman-adv: include gfp.h for GFP_* defines batman-adv: include build_bug.h for BUILD_BUG_ON define batman-adv: Include net.h for net_ratelimited_function batman-adv: include kobject.h for kobject_* functions batman-adv: Remove unused sched.h include batman-adv: Add missing kernel-doc to packet.h batman-adv: Use parentheses in function kernel-doc batman-adv: Use inline kernel-doc for enum/struct batman-adv: Fix kernel-doc references to struct members batman-adv: Add kernel-doc to structs in headers batman-adv: Add kernel-doc to enums in headers batman-adv: Add kernel-doc to functions in headers batman-adv: Add kernel-doc to externally visible functions ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.15-rc4, created. v4.15-rc4
by postmaster＠open-mesh.org 18 Dec '17

18 Dec '17

The annotated tag, v4.15-rc4 has been created at e0e0c107ce60c16ec503033024744889ebd8f9d5 (tag) tagging 1291a0d5049dbc06baaaf66a9ff3f53db493b19b (commit) replaces v4.15-rc3 tagged by Linus Torvalds on Sun Dec 17 19:00:05 2017 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15-rc4 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaNy81AAoJEHm+PkMAQRiGq2YH/1C1so18qErhPosdfeLIXLbA iC9XcIvkPuMfjDw4EfSWOzhKnzgqGuc8q/Vzz0ulDreNVUb52nBeRy69QgNoZBTB NkLdrUKBnlArvRhBXToQGW/s1eI/gobuHBJb7/fbpvsUtPYcDE2nUXAEsMlagn5L BMHNzE3TByaWj0SqJtZAZvaQN2MdWV8ArHBPaC+MtR2C1VJIyl0mT9CdCu2NpTES +FncKJ6/qplSBNSUJSfYmFLfEKVcQxvHMi1kp9jOGlVjPM3cOPKRpv8x69x/IPoB 3l82AikL+Ju0738oJ0Fp/IhfGUqpXz+FwUz1JmCdrcOby75RHomJuJCUBTtjXA4= =lYkx -----END PGP SIGNATURE----- Sven Eckelmann (4): batman-adv: Always initialize fragment header priority batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible batman-adv: Fix kernel-doc for timer functions batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, ecsv/flowdissector-nouapi, created. v4.15-rc1-22-gce3b35591918
by postmaster＠open-mesh.org 15 Dec '17

15 Dec '17

The branch, ecsv/flowdissector-nouapi has been created at ce3b35591918364f87015a78e9ca81b13988a800 (commit) - Shortlog ------------------------------------------------------------ commit ce3b35591918364f87015a78e9ca81b13988a800 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Nov 27 13:33:41 2017 +0100 flow_dissector: Parse batman-adv unicast headers The batman-adv unicast packets contain a full layer 2 frame in encapsulated form. The flow dissector must therefore be able to parse the batman-adv unicast header to reach the layer 2+3 information. +--------------------+ | ip(v6)hdr | +--------------------+ | inner ethhdr | +--------------------+ | batadv unicast hdr | +--------------------+ | outer ethhdr | +--------------------+ The obtained information from the upper layer can then be used by RPS to schedule the processing on separate cores. This allows better distribution of multiple flows from the same neighbor to different cores. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit be724fd773f8760fc69661978f4ef33e70255540 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:39:48 2017 +0100 batman-adv: Move packet.h to linux headers The linux flow dissecotr requires access to the packet definitions to be able to decode ETH_P_BATMAN ethernet packets. It must therefore be available in the global include path. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit a3963cc6b0a8deb250faf49b48e1f336c9b749a8 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 11:39:29 2017 +0100 batman-adv: Let packet.h include its headers directly The headers used by packet.h should also be included by it directly. main.h is currently dealing with it in batman-adv, but this will no longer work when this header is moved to include/linux/. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20171023, deleted. v4.14-rc3-877-g40b16b9be577
by postmaster＠open-mesh.org 15 Dec '17

15 Dec '17

The annotated tag, batadv-next-for-davem-20171023 has been deleted was 87c48867145f8662a657132e6fb8d044bb2e56c0 ----------------------------------------------------------------------- tag batadv-next-for-davem-20171023 This documentation/cleanup patchset includes the following patches: - Fix parameter kerneldoc which caused kerneldoc warnings, by Sven Eckelmann - Remove spurious warnings in B.A.T.M.A.N. V neighbor comparison, by Sven Eckelmann - Use inline kernel-doc style for UAPI constants, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlnuC9IWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeob0tEACwqVIrUSX9ru7N+uAv04jm9GXy zR43z5cEzHEiH/yZZKxL7z7sOXTO+fHj06JKWDKUvEYYhUhDBL7xqvgBBcHZO0AK TQLHirY+gMRJXphNsfrUWJ5IbB+C0wz7BpBuA+TLG8I0ibc9tjIt/pGdwJO34Z0C Ym0PSB8A1ej+l3CyGMCICramOexuBPRrbtgKrxi4uO56c+RYnfZkPdB+EFMvPGA+ mcofumu/rKr/NFk/ZS77yooqBe2q93IVFzvRc7h3anm84XD9n4HwD5Rm4ruvXEBt FH4w0ZPmMbkBnwqkiWgefV5hDqKt1tLCEW9lxvokceoKy0ntDvzSqCU/yad2MGVw Kf27E6/iYhshVVgXFY5Q4E3YC5Z+Y2+rKL9xO7Dr4xYKi3GCIsCzz+aCJn3rRVgI q4qTVS/+bLR2YxYkHyPs5ux82G7VfhnaPI6jQkUM6ZeTKE1hqt30J7fDnHFRb7b4 WVz6MGr46HGs9mBwhZ64mCercdS4+dIKYFjKS0avm39LWtOStgqoZs9rasLKE4/T wYfmrkX2tWpOrmZjO4ySuSBz9F3o4Yy0zwBeBNcnb11Mm8/08D6CwXLKg2q9wiY0 E3hFjwg2AGivf0Lq9KMSS30tpC0iDz+xpJdGwxZumALX602pWv7f20cvMT31tR57 Rmqf4ZEK82N2YpiGWA== =qGzP -----END PGP SIGNATURE----- 40b16b9be5773a314948656c96adf7bf7cfdbd0b batman-adv: use inline kernel-doc for uapi constants ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20171215, deleted. v4.15-rc1-20-g74027aab7f80
by postmaster＠open-mesh.org 15 Dec '17

15 Dec '17

The annotated tag, batadv-next-for-davem-20171215 has been deleted was bce7a0f70bcd7b0b26ba0084d43bb570da51d267 ----------------------------------------------------------------------- tag batadv-next-for-davem-20171215 This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - de-inline hash functions to save memory footprint, by Denys Vlasenko - Add License information to various files, by Sven Eckelmann (4 patches) - Change batman_adv.h from ISC to MIT, by Sven Eckelmann - Improve various includes, by Sven Eckelmann (5 patches) - Lots of kernel-doc work by Sven Eckelmann (8 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAloztGoWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoQjCD/9RNurmxUDNf5n/DDNsf4PuizKJ XrTZ/YzNOtYOpjYibVCINdCuK0x4zHYsti44IDjWi5FCCvn3kDRvZCxxJaspXpNo NJ8oa2WmYqZS54cHaQljDyuhOjBEeXRhvI33OoR5Czbkv/AaqnY7CPqfIK5bYg5f qMwrsgLLMlzqZdJ5GLGATS4WJJQ93A3hgeyGLsXcE3RV/fdv9TUiKYG7T+mg+GGK 3oQ+eODx0CQGbc4B0THBdFHaecd28/Uc1uQFRfVpd+fSlG1tiMtR3VVwWnZubG38 QAHUSyEFw+ETGA4oVxk0PY9cR7ZIwCyIYuSGS/kFAIs+5XyPxnseJBDAY0Jni4GO A0z6jqIAOBimU/mEFH5FGjMrOh0lMXBON560XDxcx6rtltBttb+popmnE/WiMsnD jzHHcj7fo7AhXH2oU6/KQuf0BIy66fCiet6Ijrkc5hURUyw9Hg/G3NNvlYmiYJ7i ysqud+Au7LAYzvgnIhm7E3wcRpMdWWO/ZbN/llRgYI6JZrx3gFNHnKDS879DpzrO mLDXM29MjdfANVgZXh2YHdPpRWRPHzQaskzVpob1/N+HwzNv7ZJqzFFynOSsCq5x 7ZjX0RBQTLE4x+MWoGxEWKrQ2fyk4LeDoFq2xYi5lWwDlebDuFiYTey0AziYRgQ2 6EzDFMkV3QvtoPwKyA== =e8rD -----END PGP SIGNATURE----- 74027aab7f808eca71521b61d55fc06e040ec89e batman-adv: Add kernel-doc to externally visible functions ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: Remove License-Filename from packet.h (0f53288)
by postmaster＠open-mesh.org 15 Dec '17

15 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0f5328829dcadc1937b5bae1929c453c924bba0d Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 15 17:40:24 2017 +0100 batctl: Remove License-Filename from packet.h David Miller rejects this change > Nothing else in entire kernel tree uses this. > > I strongly discourage you from doing something at this level that is > not in accordance with some kind of precendence or official > recommendation for the rest of the kernel project. > > If you want this to start happening, discuss it on a global scale > on lkml. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0f5328829dcadc1937b5bae1929c453c924bba0d packet.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/packet.h b/packet.h index ebe0605..dccbd4a 100644 --- a/packet.h +++ b/packet.h @@ -14,8 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. - * - * License-Filename: LICENSES/preferred/GPL-2.0 */ #ifndef _NET_BATMAN_ADV_PACKET_H_

1 0

[linux-merge]linux integration; branch, ecsv/flowdissector-header-rename, created. v4.15-rc1-25-gb7a18192f75a
by postmaster＠open-mesh.org 15 Dec '17

15 Dec '17

The branch, ecsv/flowdissector-header-rename has been created at b7a18192f75ad7d389e697b566aba3e6c3c2743f (commit) - Shortlog ------------------------------------------------------------ commit b7a18192f75ad7d389e697b566aba3e6c3c2743f Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Nov 27 13:33:41 2017 +0100 flow_dissector: Parse batman-adv unicast headers The batman-adv unicast packets contain a full layer 2 frame in encapsulated form. The flow dissector must therefore be able to parse the batman-adv unicast header to reach the layer 2+3 information. +--------------------+ | ip(v6)hdr | +--------------------+ | inner ethhdr | +--------------------+ | batadv unicast hdr | +--------------------+ | outer ethhdr | +--------------------+ The obtained information from the upper layer can then be used by RPS to schedule the processing on separate cores. This allows better distribution of multiple flows from the same neighbor to different cores. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 3af0bc37cb673231648915e831d11d47029d3aea Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:39:48 2017 +0100 batman-adv: Convert packet.h to uapi header The header file is used by different userspace programs to inject packets or to decode sniffed packets. It should therefore be available to them as userspace header. Also other components in the kernel (like the flow dissector) require access to the packet definitions to be able to decode ETH_P_BATMAN ethernet packets. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 23029d2a26700d6642c77e05a10b5c432b8bee24 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:17:28 2017 +0100 batman-adv: Remove usage of BIT(x) in packet.h The BIT(x) macro is no longer available for uapi headers because it is defined outside of it (linux/bitops.h). The use of it must therefore be avoided and replaced by an appropriate other representation. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit bcc795fdbebce9e5b1794a82b19c566721efc656 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 11:39:29 2017 +0100 batman-adv: Let packet.h include its headers directly The headers used by packet.h should also be included by it directly. main.h is currently dealing with it in batman-adv, but this will no longer work when this header is moved to include/uapi/linux/. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit fb7761283afd1ee5ec667bb6ba892a24b747da1a Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:31:51 2017 +0100 batman-adv: Rename batman-adv.h to batadv_genl.h This file contains the relevant information to let userspace communicate with batman-adv over generic netlink. The relevant genl enums for the attributes and commands have the prefix batadv_genl. Renaming this file to this name therefore represents the content better and avoids confusion with the file which will contain the packet format definitions. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> commit 8b72bd899005554441aa7376dbf6ff2eb8c7532f Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Tue Dec 5 14:22:16 2017 +0100 batman-adv: Change nl references to genl The batman-adv netlink functionality is actually not pure netlink but is using NETLINK_GENERIC and related API. The code should therefore also use this "genl" instead of "nl" to make this more clear. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits