linux-merge March 2018

linux-merge@lists.open-mesh.org

3 participants
62 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20180305
by batman＠open-mesh.org 05 Mar '18

05 Mar '18

The following commit has been merged in the master branch: commit 10d570284258a30dc104c50787c5289ec49f3d23 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Feb 19 14:08:52 2018 +0100 batman-adv: Ignore invalid batadv_iv_gw during netlink send The function batadv_iv_gw_dump stops the processing loop when batadv_iv_gw_dump_entry returns a non-0 return code. This should only happen when the buffer is full. Otherwise, an empty message may be returned by batadv_gw_dump. This empty message will then stop the netlink dumping of gateway entries. At worst, not a single entry is returned to userspace even when plenty of possible gateways exist. Fixes: efb766af06e3 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 79e326383726..8f64439647e3 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2729,7 +2729,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, struct batadv_neigh_ifinfo *router_ifinfo = NULL; struct batadv_neigh_node *router; struct batadv_gw_node *curr_gw; - int ret = -EINVAL; + int ret = 0; void *hdr; router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180305
by batman＠open-mesh.org 05 Mar '18

05 Mar '18

The following commit has been merged in the master branch: commit 011c935fceae5252619ef730baa610c655281dda Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Mon Feb 19 14:08:53 2018 +0100 batman-adv: Ignore invalid batadv_v_gw during netlink send The function batadv_v_gw_dump stops the processing loop when batadv_v_gw_dump_entry returns a non-0 return code. This should only happen when the buffer is full. Otherwise, an empty message may be returned by batadv_gw_dump. This empty message will then stop the netlink dumping of gateway entries. At worst, not a single entry is returned to userspace even when plenty of possible gateways exist. Fixes: b71bb6f924fe ("batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations") Signed-off-by: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 27e165ac9302..c74f81341dab 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -928,7 +928,7 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, struct batadv_neigh_ifinfo *router_ifinfo = NULL; struct batadv_neigh_node *router; struct batadv_gw_node *curr_gw; - int ret = -EINVAL; + int ret = 0; void *hdr; router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180305
by batman＠open-mesh.org 05 Mar '18

05 Mar '18

The following commit has been merged in the master branch: commit b0264ecdfeab5f889b02ec54af7ca8cc1c245e2f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 24 12:03:36 2018 +0100 batman-adv: Fix netlink dumping of BLA claims The function batadv_bla_claim_dump_bucket must be able to handle non-complete dumps of a single bucket. It tries to do that by saving the latest dumped index in *idx_skip to inform the caller about the current state. But the caller only assumes that buckets were not completely dumped when the return code is non-zero. This function must therefore also return a non-zero index when the dumping of an entry failed. Otherwise the caller will just skip all remaining buckets. And the function must also reset *idx_skip back to zero when it finished a bucket. Otherwise it will skip the same number of entries in the next bucket as the previous one had. Fixes: 04f3f5bf1883 ("batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink") Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index fad47853ad3c..20b548ea5a0a 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2161,22 +2161,25 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, { struct batadv_bla_claim *claim; int idx = 0; + int ret = 0; rcu_read_lock(); hlist_for_each_entry_rcu(claim, head, hash_entry) { if (idx++ < *idx_skip) continue; - if (batadv_bla_claim_dump_entry(msg, portid, seq, - primary_if, claim)) { + + ret = batadv_bla_claim_dump_entry(msg, portid, seq, + primary_if, claim); + if (ret) { *idx_skip = idx - 1; goto unlock; } } - *idx_skip = idx; + *idx_skip = 0; unlock: rcu_read_unlock(); - return 0; + return ret; } /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180305
by batman＠open-mesh.org 05 Mar '18

05 Mar '18

The following commit has been merged in the master branch: commit fce672db548ff19e76a08a32a829544617229bc2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 24 12:03:37 2018 +0100 batman-adv: Fix netlink dumping of BLA backbones The function batadv_bla_backbone_dump_bucket must be able to handle non-complete dumps of a single bucket. It tries to do that by saving the latest dumped index in *idx_skip to inform the caller about the current state. But the caller only assumes that buckets were not completely dumped when the return code is non-zero. This function must therefore also return a non-zero index when the dumping of an entry failed. Otherwise the caller will just skip all remaining buckets. And the function must also reset *idx_skip back to zero when it finished a bucket. Otherwise it will skip the same number of entries in the next bucket as the previous one had. Fixes: ea4152e11716 ("batman-adv: add backbone table netlink support") Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 20b548ea5a0a..b1a08374088b 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2394,22 +2394,25 @@ batadv_bla_backbone_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, { struct batadv_bla_backbone_gw *backbone_gw; int idx = 0; + int ret = 0; rcu_read_lock(); hlist_for_each_entry_rcu(backbone_gw, head, hash_entry) { if (idx++ < *idx_skip) continue; - if (batadv_bla_backbone_dump_entry(msg, portid, seq, - primary_if, backbone_gw)) { + + ret = batadv_bla_backbone_dump_entry(msg, portid, seq, + primary_if, backbone_gw); + if (ret) { *idx_skip = idx - 1; goto unlock; } } - *idx_skip = idx; + *idx_skip = 0; unlock: rcu_read_unlock(); - return 0; + return ret; } /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180305
by batman＠open-mesh.org 05 Mar '18

05 Mar '18

The following commit has been merged in the master branch: commit abd6360591d3f8259f41c34e31ac4826dfe621b8 Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Tue Jan 23 10:59:49 2018 +0100 batman-adv: fix packet checksum in receive path eth_type_trans() internally calls skb_pull(), which does not adjust the skb checksum; skb_postpull_rcsum() is necessary to avoid log spam of the form "bat0: hw csum failure" when packets with CHECKSUM_COMPLETE are received. Note that in usual setups, packets don't reach batman-adv with CHECKSUM_COMPLETE (I assume NICs bail out of checksumming when they see batadv's ethtype?), which is why the log messages do not occur on every system using batman-adv. I could reproduce this issue by stacking batman-adv on top of a VXLAN interface. Fixes: c6c8fea29769 ("net: Add batman-adv meshing protocol") Tested-by: Maximilian Wilhelm <max(a)sdn.clinic> Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 900c5ce21cd4..367a81fb785f 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -459,13 +459,7 @@ void batadv_interface_rx(struct net_device *soft_iface, /* skb->dev & skb->pkt_type are set here */ skb->protocol = eth_type_trans(skb, soft_iface); - - /* should not be necessary anymore as we use skb_pull_rcsum() - * TODO: please verify this and remove this TODO - * -- Dec 21st 2009, Simon Wunderlich - */ - - /* skb->ip_summed = CHECKSUM_UNNECESSARY; */ + skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); batadv_inc_counter(bat_priv, BATADV_CNT_RX); batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20180305
by batman＠open-mesh.org 05 Mar '18

05 Mar '18

The following commit has been merged in the master branch: commit 3bf2a09da956b43ecfaa630a2ef9a477f991a46a Author: Matthias Schiffer <mschiffer(a)universe-factory.net> Date: Tue Jan 23 10:59:50 2018 +0100 batman-adv: invalidate checksum on fragment reassembly A more sophisticated implementation could try to combine fragment checksums when all fragments have CHECKSUM_COMPLETE and are split at even offsets. For now, we just set ip_summed to CHECKSUM_NONE to avoid "hw csum failure" warnings in the kernel log when fragmented frames are received. In consequence, skb_pull_rcsum() can be replaced with skb_pull(). Note that in usual setups, packets don't reach batman-adv with CHECKSUM_COMPLETE (I assume NICs bail out of checksumming when they see batadv's ethtype?), which is why the log messages do not occur on every system using batman-adv. I could reproduce this issue by stacking batman-adv on top of a VXLAN interface. Fixes: 610bfc6bc99b ("batman-adv: Receive fragmented packets and merge") Tested-by: Maximilian Wilhelm <max(a)sdn.clinic> Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 22dde42fd80e..5afe641ee4b0 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -288,7 +288,8 @@ batadv_frag_merge_packets(struct hlist_head *chain) /* Move the existing MAC header to just before the payload. (Override * the fragment header.) */ - skb_pull_rcsum(skb_out, hdr_size); + skb_pull(skb_out, hdr_size); + skb_out->ip_summed = CHECKSUM_NONE; memmove(skb_out->data - ETH_HLEN, skb_mac_header(skb_out), ETH_HLEN); skb_set_mac_header(skb_out, -ETH_HLEN); skb_reset_network_header(skb_out); -- LinuxNextTracking

1 0

Noticed difference in batadv_packet.h in master.diff
by postmaster＠open-mesh.org 05 Mar '18

05 Mar '18

--- batman-adv_master.packet.h 2018-03-06 00:05:02.030715108 +0100 +++ batctl_master.packet.h 2018-03-06 00:05:02.038714932 +0100 @@ -196,6 +196,8 @@ __be16 group; /* group id */ }; +#pragma pack() + /** * struct batadv_ogm_packet - ogm (routing protocol) packet * @packet_type: batman-adv packet type, part of the general header @@ -220,6 +222,9 @@ __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. + */ }; #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) @@ -244,6 +249,9 @@ __u8 orig[ETH_ALEN]; __be16 tvlv_len; __be32 throughput; + /* __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. + */ }; #define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet) @@ -397,6 +405,7 @@ * misalignment of the payload after the ethernet header. It may also lead to * leakage of information when the padding it not initialized before sending. */ +#pragma pack(2) /** * struct batadv_unicast_packet - unicast packet for network payload @@ -524,6 +533,8 @@ __be16 coded_len; }; +#pragma pack() + /** * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload * @packet_type: batman-adv packet type, part of the general header @@ -630,6 +641,4 @@ __u8 reserved[3]; }; -#pragma pack() - #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */

1 0

Build check errors found: 2018-03-05
by postmaster＠open-mesh.org 05 Mar '18

05 Mar '18

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master * headers Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/include/uapi/linux/batman_adv.h | 2 +- net/net/batman-adv/Kconfig | 2 +- net/net/batman-adv/Makefile | 2 +- net/net/batman-adv/bat_algo.c | 2 +- net/net/batman-adv/bat_algo.h | 2 +- net/net/batman-adv/bat_iv_ogm.c | 2 +- net/net/batman-adv/bat_iv_ogm.h | 2 +- net/net/batman-adv/bat_v.c | 2 +- net/net/batman-adv/bat_v.h | 2 +- net/net/batman-adv/bat_v_elp.c | 2 +- net/net/batman-adv/bat_v_elp.h | 2 +- net/net/batman-adv/bat_v_ogm.c | 2 +- net/net/batman-adv/bat_v_ogm.h | 2 +- net/net/batman-adv/bitarray.c | 2 +- net/net/batman-adv/bitarray.h | 2 +- net/net/batman-adv/bridge_loop_avoidance.c | 2 +- net/net/batman-adv/bridge_loop_avoidance.h | 2 +- net/net/batman-adv/debugfs.c | 2 +- net/net/batman-adv/debugfs.h | 2 +- net/net/batman-adv/distributed-arp-table.c | 2 +- net/net/batman-adv/distributed-arp-table.h | 2 +- net/net/batman-adv/fragmentation.c | 2 +- net/net/batman-adv/fragmentation.h | 2 +- net/net/batman-adv/gateway_client.c | 2 +- net/net/batman-adv/gateway_client.h | 2 +- net/net/batman-adv/gateway_common.c | 2 +- net/net/batman-adv/gateway_common.h | 2 +- net/net/batman-adv/hard-interface.c | 2 +- net/net/batman-adv/hard-interface.h | 2 +- net/net/batman-adv/hash.c | 2 +- net/net/batman-adv/hash.h | 2 +- net/net/batman-adv/icmp_socket.c | 4 ++-- net/net/batman-adv/icmp_socket.h | 2 +- net/net/batman-adv/log.c | 4 ++-- net/net/batman-adv/log.h | 2 +- net/net/batman-adv/main.c | 2 +- net/net/batman-adv/main.h | 2 +- net/net/batman-adv/multicast.c | 6 +++--- net/net/batman-adv/multicast.h | 2 +- net/net/batman-adv/netlink.c | 2 +- net/net/batman-adv/netlink.h | 2 +- net/net/batman-adv/network-coding.c | 2 +- net/net/batman-adv/network-coding.h | 2 +- net/net/batman-adv/originator.c | 2 +- net/net/batman-adv/originator.h | 2 +- net/net/batman-adv/routing.c | 2 +- net/net/batman-adv/routing.h | 2 +- net/net/batman-adv/send.c | 2 +- net/net/batman-adv/send.h | 2 +- net/net/batman-adv/soft-interface.c | 2 +- net/net/batman-adv/soft-interface.h | 2 +- net/net/batman-adv/sysfs.c | 2 +- net/net/batman-adv/sysfs.h | 2 +- net/net/batman-adv/tp_meter.c | 2 +- net/net/batman-adv/tp_meter.h | 2 +- net/net/batman-adv/translation-table.c | 2 +- net/net/batman-adv/translation-table.h | 2 +- net/net/batman-adv/tvlv.c | 2 +- net/net/batman-adv/tvlv.h | 2 +- net/net/batman-adv/types.h | 2 +- 60 files changed, 64 insertions(+), 64 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/include/uapi/linux/batman_adv.h | 2 netnext/net/batman-adv/Kconfig | 2 netnext/net/batman-adv/Makefile | 2 netnext/net/batman-adv/bat_algo.c | 2 netnext/net/batman-adv/bat_algo.h | 2 netnext/net/batman-adv/bat_iv_ogm.c | 28 +++---- netnext/net/batman-adv/bat_iv_ogm.h | 2 netnext/net/batman-adv/bat_v.c | 4 - netnext/net/batman-adv/bat_v.h | 2 netnext/net/batman-adv/bat_v_elp.c | 2 netnext/net/batman-adv/bat_v_elp.h | 2 netnext/net/batman-adv/bat_v_ogm.c | 2 netnext/net/batman-adv/bat_v_ogm.h | 2 netnext/net/batman-adv/bitarray.c | 2 netnext/net/batman-adv/bitarray.h | 2 netnext/net/batman-adv/bridge_loop_avoidance.c | 24 ++---- netnext/net/batman-adv/bridge_loop_avoidance.h | 2 netnext/net/batman-adv/debugfs.c | 2 netnext/net/batman-adv/debugfs.h | 2 netnext/net/batman-adv/distributed-arp-table.c | 4 - netnext/net/batman-adv/distributed-arp-table.h | 2 netnext/net/batman-adv/fragmentation.c | 5 - netnext/net/batman-adv/fragmentation.h | 2 netnext/net/batman-adv/gateway_client.c | 2 netnext/net/batman-adv/gateway_client.h | 2 netnext/net/batman-adv/gateway_common.c | 2 netnext/net/batman-adv/gateway_common.h | 2 netnext/net/batman-adv/hard-interface.c | 11 --- netnext/net/batman-adv/hard-interface.h | 2 netnext/net/batman-adv/hash.c | 2 netnext/net/batman-adv/hash.h | 2 netnext/net/batman-adv/icmp_socket.c | 4 - netnext/net/batman-adv/icmp_socket.h | 2 netnext/net/batman-adv/log.c | 4 - netnext/net/batman-adv/log.h | 2 netnext/net/batman-adv/main.c | 2 netnext/net/batman-adv/main.h | 16 +--- netnext/net/batman-adv/multicast.c | 58 +--------------- netnext/net/batman-adv/multicast.h | 2 netnext/net/batman-adv/netlink.c | 2 netnext/net/batman-adv/netlink.h | 2 netnext/net/batman-adv/network-coding.c | 2 netnext/net/batman-adv/network-coding.h | 2 netnext/net/batman-adv/originator.c | 6 - netnext/net/batman-adv/originator.h | 6 - netnext/net/batman-adv/routing.c | 2 netnext/net/batman-adv/routing.h | 2 netnext/net/batman-adv/send.c | 2 netnext/net/batman-adv/send.h | 2 netnext/net/batman-adv/soft-interface.c | 10 ++ netnext/net/batman-adv/soft-interface.h | 2 netnext/net/batman-adv/sysfs.c | 2 netnext/net/batman-adv/sysfs.h | 2 netnext/net/batman-adv/tp_meter.c | 2 netnext/net/batman-adv/tp_meter.h | 2 netnext/net/batman-adv/translation-table.c | 2 netnext/net/batman-adv/translation-table.h | 2 netnext/net/batman-adv/tvlv.c | 2 netnext/net/batman-adv/tvlv.h | 2 netnext/net/batman-adv/types.h | 13 +-- 60 files changed, 112 insertions(+), 173 deletions(-) master: headers --------------- diff --git a/build/net/batman-adv/soft-interface.c b/build/net/batman-adv/soft-interface.c index 33ac6c6..e887949 100644 --- a/build/net/batman-adv/soft-interface.c +++ b/build/net/batman-adv/soft-interface.c @@ -65,6 +65,8 @@ #include "sysfs.h" #include "translation-table.h" +struct netlink_ext_ack; + /** * batadv_skb_head_push() - Increase header size and move (push) head pointer * @skb: packet buffer which should be modified Statistics ========== maint ----- Failed tests: 1 Started build tests: 59 Tested Linux versions: 27 Tested configs: 50 master ------ Failed tests: 2 Started build tests: 58 Tested Linux versions: 30 Tested configs: 48

1 0

Build check errors found: 2018-03-04
by postmaster＠open-mesh.org 04 Mar '18

04 Mar '18

Name of failed tests ==================== master ------ * difference between net-next and batadv master * headers maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/include/uapi/linux/batman_adv.h | 2 - net/net/batman-adv/Kconfig | 2 - net/net/batman-adv/Makefile | 2 - net/net/batman-adv/bat_algo.c | 2 - net/net/batman-adv/bat_algo.h | 2 - net/net/batman-adv/bat_iv_ogm.c | 28 ++++++++------------ net/net/batman-adv/bat_iv_ogm.h | 2 - net/net/batman-adv/bat_v.c | 4 +- net/net/batman-adv/bat_v.h | 2 - net/net/batman-adv/bat_v_elp.c | 2 - net/net/batman-adv/bat_v_elp.h | 2 - net/net/batman-adv/bat_v_ogm.c | 2 - net/net/batman-adv/bat_v_ogm.h | 2 - net/net/batman-adv/bitarray.c | 2 - net/net/batman-adv/bitarray.h | 2 - net/net/batman-adv/bridge_loop_avoidance.c | 24 ++++++----------- net/net/batman-adv/bridge_loop_avoidance.h | 2 - net/net/batman-adv/debugfs.c | 2 - net/net/batman-adv/debugfs.h | 2 - net/net/batman-adv/distributed-arp-table.c | 2 - net/net/batman-adv/distributed-arp-table.h | 2 - net/net/batman-adv/fragmentation.c | 5 +-- net/net/batman-adv/fragmentation.h | 2 - net/net/batman-adv/gateway_client.c | 2 - net/net/batman-adv/gateway_client.h | 2 - net/net/batman-adv/gateway_common.c | 2 - net/net/batman-adv/gateway_common.h | 2 - net/net/batman-adv/hard-interface.c | 11 ++----- net/net/batman-adv/hard-interface.h | 2 - net/net/batman-adv/hash.c | 2 - net/net/batman-adv/hash.h | 2 - net/net/batman-adv/icmp_socket.c | 4 +- net/net/batman-adv/icmp_socket.h | 2 - net/net/batman-adv/log.c | 4 +- net/net/batman-adv/log.h | 2 - net/net/batman-adv/main.c | 2 - net/net/batman-adv/main.h | 2 - net/net/batman-adv/multicast.c | 2 - net/net/batman-adv/multicast.h | 2 - net/net/batman-adv/netlink.c | 2 - net/net/batman-adv/netlink.h | 2 - net/net/batman-adv/network-coding.c | 2 - net/net/batman-adv/network-coding.h | 2 - net/net/batman-adv/originator.c | 6 ++-- net/net/batman-adv/originator.h | 6 ++-- net/net/batman-adv/routing.c | 2 - net/net/batman-adv/routing.h | 2 - net/net/batman-adv/send.c | 2 - net/net/batman-adv/send.h | 2 - net/net/batman-adv/soft-interface.c | 10 +++++-- net/net/batman-adv/soft-interface.h | 2 - net/net/batman-adv/sysfs.c | 2 - net/net/batman-adv/sysfs.h | 2 - net/net/batman-adv/tp_meter.c | 2 - net/net/batman-adv/tp_meter.h | 2 - net/net/batman-adv/translation-table.c | 2 - net/net/batman-adv/translation-table.h | 2 - net/net/batman-adv/tvlv.c | 2 - net/net/batman-adv/tvlv.h | 2 - net/net/batman-adv/types.h | 13 ++++----- 60 files changed, 101 insertions(+), 112 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/include/uapi/linux/batman_adv.h | 2 - netnext/net/batman-adv/Kconfig | 2 - netnext/net/batman-adv/Makefile | 2 - netnext/net/batman-adv/bat_algo.c | 2 - netnext/net/batman-adv/bat_algo.h | 2 - netnext/net/batman-adv/bat_iv_ogm.c | 28 ++++++---------- netnext/net/batman-adv/bat_iv_ogm.h | 2 - netnext/net/batman-adv/bat_v.c | 4 +- netnext/net/batman-adv/bat_v.h | 2 - netnext/net/batman-adv/bat_v_elp.c | 2 - netnext/net/batman-adv/bat_v_elp.h | 2 - netnext/net/batman-adv/bat_v_ogm.c | 2 - netnext/net/batman-adv/bat_v_ogm.h | 2 - netnext/net/batman-adv/bitarray.c | 2 - netnext/net/batman-adv/bitarray.h | 2 - netnext/net/batman-adv/bridge_loop_avoidance.c | 24 +++++-------- netnext/net/batman-adv/bridge_loop_avoidance.h | 2 - netnext/net/batman-adv/debugfs.c | 2 - netnext/net/batman-adv/debugfs.h | 2 - netnext/net/batman-adv/distributed-arp-table.c | 4 +- netnext/net/batman-adv/distributed-arp-table.h | 2 - netnext/net/batman-adv/fragmentation.c | 5 +- netnext/net/batman-adv/fragmentation.h | 2 - netnext/net/batman-adv/gateway_client.c | 2 - netnext/net/batman-adv/gateway_client.h | 2 - netnext/net/batman-adv/gateway_common.c | 2 - netnext/net/batman-adv/gateway_common.h | 2 - netnext/net/batman-adv/hard-interface.c | 11 +----- netnext/net/batman-adv/hard-interface.h | 2 - netnext/net/batman-adv/hash.c | 2 - netnext/net/batman-adv/hash.h | 2 - netnext/net/batman-adv/icmp_socket.c | 4 +- netnext/net/batman-adv/icmp_socket.h | 2 - netnext/net/batman-adv/log.c | 4 +- netnext/net/batman-adv/log.h | 2 - netnext/net/batman-adv/main.c | 2 - netnext/net/batman-adv/main.h | 16 ++++----- netnext/net/batman-adv/multicast.c | 2 - netnext/net/batman-adv/multicast.h | 2 - netnext/net/batman-adv/netlink.c | 2 - netnext/net/batman-adv/netlink.h | 2 - netnext/net/batman-adv/network-coding.c | 2 - netnext/net/batman-adv/network-coding.h | 2 - netnext/net/batman-adv/originator.c | 6 +-- netnext/net/batman-adv/originator.h | 6 +-- netnext/net/batman-adv/routing.c | 2 - netnext/net/batman-adv/routing.h | 2 - netnext/net/batman-adv/send.c | 2 - netnext/net/batman-adv/send.h | 2 - netnext/net/batman-adv/soft-interface.c | 10 ++++- netnext/net/batman-adv/soft-interface.h | 2 - netnext/net/batman-adv/sysfs.c | 2 - netnext/net/batman-adv/sysfs.h | 2 - netnext/net/batman-adv/tp_meter.c | 2 - netnext/net/batman-adv/tp_meter.h | 2 - netnext/net/batman-adv/translation-table.c | 2 - netnext/net/batman-adv/translation-table.h | 2 - netnext/net/batman-adv/tvlv.c | 2 - netnext/net/batman-adv/tvlv.h | 2 - netnext/net/batman-adv/types.h | 13 +++---- 60 files changed, 108 insertions(+), 121 deletions(-) master: headers --------------- diff --git a/build/net/batman-adv/soft-interface.c b/build/net/batman-adv/soft-interface.c index 33ac6c6..e887949 100644 --- a/build/net/batman-adv/soft-interface.c +++ b/build/net/batman-adv/soft-interface.c @@ -65,6 +65,8 @@ #include "sysfs.h" #include "translation-table.h" +struct netlink_ext_ack; + /** * batadv_skb_head_push() - Increase header size and move (push) head pointer * @skb: packet buffer which should be modified Statistics ========== master ------ Failed tests: 2 Started build tests: 53 Tested Linux versions: 26 Tested configs: 43 maint ----- Failed tests: 1 Started build tests: 65 Tested Linux versions: 31 Tested configs: 52

1 0

Build check errors found: 2018-03-03
by postmaster＠open-mesh.org 03 Mar '18

03 Mar '18

Name of failed tests ==================== master ------ * difference between net-next and batadv master * headers maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/include/uapi/linux/batman_adv.h | 2 - net/net/batman-adv/Kconfig | 2 - net/net/batman-adv/Makefile | 2 - net/net/batman-adv/bat_algo.c | 2 - net/net/batman-adv/bat_algo.h | 2 - net/net/batman-adv/bat_iv_ogm.c | 28 ++++++++------------ net/net/batman-adv/bat_iv_ogm.h | 2 - net/net/batman-adv/bat_v.c | 4 +- net/net/batman-adv/bat_v.h | 2 - net/net/batman-adv/bat_v_elp.c | 2 - net/net/batman-adv/bat_v_elp.h | 2 - net/net/batman-adv/bat_v_ogm.c | 2 - net/net/batman-adv/bat_v_ogm.h | 2 - net/net/batman-adv/bitarray.c | 2 - net/net/batman-adv/bitarray.h | 2 - net/net/batman-adv/bridge_loop_avoidance.c | 24 ++++++----------- net/net/batman-adv/bridge_loop_avoidance.h | 2 - net/net/batman-adv/debugfs.c | 2 - net/net/batman-adv/debugfs.h | 2 - net/net/batman-adv/distributed-arp-table.c | 2 - net/net/batman-adv/distributed-arp-table.h | 2 - net/net/batman-adv/fragmentation.c | 5 +-- net/net/batman-adv/fragmentation.h | 2 - net/net/batman-adv/gateway_client.c | 2 - net/net/batman-adv/gateway_client.h | 2 - net/net/batman-adv/gateway_common.c | 2 - net/net/batman-adv/gateway_common.h | 2 - net/net/batman-adv/hard-interface.c | 11 ++----- net/net/batman-adv/hard-interface.h | 2 - net/net/batman-adv/hash.c | 2 - net/net/batman-adv/hash.h | 2 - net/net/batman-adv/icmp_socket.c | 4 +- net/net/batman-adv/icmp_socket.h | 2 - net/net/batman-adv/log.c | 4 +- net/net/batman-adv/log.h | 2 - net/net/batman-adv/main.c | 2 - net/net/batman-adv/main.h | 2 - net/net/batman-adv/multicast.c | 2 - net/net/batman-adv/multicast.h | 2 - net/net/batman-adv/netlink.c | 2 - net/net/batman-adv/netlink.h | 2 - net/net/batman-adv/network-coding.c | 2 - net/net/batman-adv/network-coding.h | 2 - net/net/batman-adv/originator.c | 6 ++-- net/net/batman-adv/originator.h | 6 ++-- net/net/batman-adv/routing.c | 2 - net/net/batman-adv/routing.h | 2 - net/net/batman-adv/send.c | 2 - net/net/batman-adv/send.h | 2 - net/net/batman-adv/soft-interface.c | 10 +++++-- net/net/batman-adv/soft-interface.h | 2 - net/net/batman-adv/sysfs.c | 2 - net/net/batman-adv/sysfs.h | 2 - net/net/batman-adv/tp_meter.c | 2 - net/net/batman-adv/tp_meter.h | 2 - net/net/batman-adv/translation-table.c | 2 - net/net/batman-adv/translation-table.h | 2 - net/net/batman-adv/tvlv.c | 2 - net/net/batman-adv/tvlv.h | 2 - net/net/batman-adv/types.h | 13 ++++----- 60 files changed, 101 insertions(+), 112 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/include/uapi/linux/batman_adv.h | 2 - netnext/net/batman-adv/Kconfig | 2 - netnext/net/batman-adv/Makefile | 2 - netnext/net/batman-adv/bat_algo.c | 2 - netnext/net/batman-adv/bat_algo.h | 2 - netnext/net/batman-adv/bat_iv_ogm.c | 28 ++++++---------- netnext/net/batman-adv/bat_iv_ogm.h | 2 - netnext/net/batman-adv/bat_v.c | 4 +- netnext/net/batman-adv/bat_v.h | 2 - netnext/net/batman-adv/bat_v_elp.c | 2 - netnext/net/batman-adv/bat_v_elp.h | 2 - netnext/net/batman-adv/bat_v_ogm.c | 2 - netnext/net/batman-adv/bat_v_ogm.h | 2 - netnext/net/batman-adv/bitarray.c | 2 - netnext/net/batman-adv/bitarray.h | 2 - netnext/net/batman-adv/bridge_loop_avoidance.c | 24 +++++-------- netnext/net/batman-adv/bridge_loop_avoidance.h | 2 - netnext/net/batman-adv/debugfs.c | 2 - netnext/net/batman-adv/debugfs.h | 2 - netnext/net/batman-adv/distributed-arp-table.c | 4 +- netnext/net/batman-adv/distributed-arp-table.h | 2 - netnext/net/batman-adv/fragmentation.c | 5 +- netnext/net/batman-adv/fragmentation.h | 2 - netnext/net/batman-adv/gateway_client.c | 2 - netnext/net/batman-adv/gateway_client.h | 2 - netnext/net/batman-adv/gateway_common.c | 2 - netnext/net/batman-adv/gateway_common.h | 2 - netnext/net/batman-adv/hard-interface.c | 11 +----- netnext/net/batman-adv/hard-interface.h | 2 - netnext/net/batman-adv/hash.c | 2 - netnext/net/batman-adv/hash.h | 2 - netnext/net/batman-adv/icmp_socket.c | 4 +- netnext/net/batman-adv/icmp_socket.h | 2 - netnext/net/batman-adv/log.c | 4 +- netnext/net/batman-adv/log.h | 2 - netnext/net/batman-adv/main.c | 2 - netnext/net/batman-adv/main.h | 16 ++++----- netnext/net/batman-adv/multicast.c | 2 - netnext/net/batman-adv/multicast.h | 2 - netnext/net/batman-adv/netlink.c | 2 - netnext/net/batman-adv/netlink.h | 2 - netnext/net/batman-adv/network-coding.c | 2 - netnext/net/batman-adv/network-coding.h | 2 - netnext/net/batman-adv/originator.c | 6 +-- netnext/net/batman-adv/originator.h | 6 +-- netnext/net/batman-adv/routing.c | 2 - netnext/net/batman-adv/routing.h | 2 - netnext/net/batman-adv/send.c | 2 - netnext/net/batman-adv/send.h | 2 - netnext/net/batman-adv/soft-interface.c | 10 ++++- netnext/net/batman-adv/soft-interface.h | 2 - netnext/net/batman-adv/sysfs.c | 2 - netnext/net/batman-adv/sysfs.h | 2 - netnext/net/batman-adv/tp_meter.c | 2 - netnext/net/batman-adv/tp_meter.h | 2 - netnext/net/batman-adv/translation-table.c | 2 - netnext/net/batman-adv/translation-table.h | 2 - netnext/net/batman-adv/tvlv.c | 2 - netnext/net/batman-adv/tvlv.h | 2 - netnext/net/batman-adv/types.h | 13 +++---- 60 files changed, 108 insertions(+), 121 deletions(-) master: headers --------------- diff --git a/build/net/batman-adv/soft-interface.c b/build/net/batman-adv/soft-interface.c index 33ac6c6..e887949 100644 --- a/build/net/batman-adv/soft-interface.c +++ b/build/net/batman-adv/soft-interface.c @@ -65,6 +65,8 @@ #include "sysfs.h" #include "translation-table.h" +struct netlink_ext_ack; + /** * batadv_skb_head_push() - Increase header size and move (push) head pointer * @skb: packet buffer which should be modified Statistics ========== master ------ Failed tests: 2 Started build tests: 66 Tested Linux versions: 30 Tested configs: 49 maint ----- Failed tests: 1 Started build tests: 57 Tested Linux versions: 27 Tested configs: 46

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge March 2018