From patchwork Mon Apr 27 15:06:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 18091 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 100F480879; Mon, 27 Apr 2020 17:06:18 +0200 (CEST) ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=open-mesh.org; s=20121; t=1587999971; b=U3FjcsLPIRP86tdIcRsC/AqbExCMLIJfc7Cd891z5XlPpdJFaTDFlDsykhxil4Q9t9+66 9b3oL5cMnKYGZ/cMQ25/szlNxV7ATD8ly13IBMJn3c+ZPTnCC80H801BxTMKYtruqSTNhXF vi3jTAH0vi6YF3Ei0bLic+FqCl+ZK6o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999971; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=X0b5hxtfyt8hQaIHfZiqB0SHeN+aHF3Q0SeRMboUkpc=; b=uAyqfkjXnV38HGr8ySrq3DQ+GeMMujyzPQYiNPZPAjCi6Yx7wo73T43OEeycUv6+qpQ4i 8JVfzsn6YACF0nk0J59OmrRfQSlr2OY8HcecwuVTEyFHZnCM2qNhrYbGd9EqMC5rbt9RIt4 GUqQJL3Rcc24JW4q8nrHp7c7ZOdF/N4= ARC-Authentication-Results: i=2; open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Authentication-Results: open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Received: from simonwunderlich.de (packetmixer.de [IPv6:2001:4d88:2000:24::c0de]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 35BCD80137 for ; Mon, 27 Apr 2020 17:06:10 +0200 (CEST) Received: from kero.packetmixer.de (p4FD5799A.dip0.t-ipconnect.de [79.213.121.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by simonwunderlich.de (Postfix) with ESMTPSA id ED2A66206E; Mon, 27 Apr 2020 17:06:09 +0200 (CEST) From: Simon Wunderlich To: davem@davemloft.net Subject: [PATCH 1/5] batman-adv: Start new development cycle Date: Mon, 27 Apr 2020 17:06:03 +0200 Message-Id: <20200427150607.31401-2-sw@simonwunderlich.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427150607.31401-1-sw@simonwunderlich.de> References: <20200427150607.31401-1-sw@simonwunderlich.de> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0NzJFcCKnpZAlffkukMJWoVX5SPs/JGPkYHC1ChhRTM=; b=uzG8Eqf5mKWFgD3dFoirswgdCUM2HsS3I951SrP1NdXCRmYq0rBVitLobD9OQUXylkABYP psag1QgMVOtyF+1BjZM06lbPgaqyzpF79Ri59Tu+6Kp1XFmllwyFXVM6p1Ni/Ij8dR357O jbyCwYptxze9ftkAoqQkYjJRawyQazo= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1587999970; a=rsa-sha256; cv=none; b=iVzKvL3F0OhgUIp3A2H3ylpuBQQg9pZoGYJpe0xpvhlGFYAcYGvhDULBRVS5KXT9nPLXmV 9tEIiy5Gx9vvJqpdoZW+qvCTibXP29OTJJOgpdBs25hLaYTLkKDhxzP1uD7a81nPt9DOdO QXDMDFIU9XMa9pYcd5y6JQcihjAnH7Y= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; spf=pass (diktynna.open-mesh.org: domain of sw@simonwunderlich.de designates 2001:4d88:2000:24::c0de as permitted sender) smtp.mailfrom=sw@simonwunderlich.de Message-ID-Hash: DIPJF5EQH4FPPOXTTRKDWW5TYNO3WEQ7 X-Message-ID-Hash: DIPJF5EQH4FPPOXTTRKDWW5TYNO3WEQ7 X-MailFrom: sw@simonwunderlich.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Simon Wunderlich --- net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 2a234d0ad445..61d8dbe8c954 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2020.1" +#define BATADV_SOURCE_VERSION "2020.2" #endif /* B.A.T.M.A.N. parameters */ From patchwork Mon Apr 27 15:06:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 18092 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 8A57780E26; Mon, 27 Apr 2020 17:06:18 +0200 (CEST) ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=open-mesh.org; s=20121; t=1587999973; b=KqxFkQReKD/EUuOoYylakvB2YJa4NOmQ8KWt7Tpvv3KOeIX+OYgZmNhSvESZ1QVt+U/ln xVPUM5e8bJ7VC+KRo2VD1avwRWsEXxNIryMr+AYvF5yVLf/pkW607FK1NEGKqbwd+gGyJqz xyMYDGRjJXyHtGg/SAGEI2+blDBBpnk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999973; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=k1YqWiuf/fTl8oKNvBOOLBSVCJFBjamTSHQWaLels6g=; b=lDCwxvjqNaQrOhKtoOFAsnuyNbvGsUk0IIaY3JOdDmiNls34gqfWuZVAYm8g1NgI8B6Tw YkLbAg7s2EyuiPgdap+mbZfGQgW0JxA91Vbmq83bD3WJXGrUTFVBORHtOHIY1jIyODsfv2b fFXRavXYmk3s4+inxsSWCb3pW8m2RYE= ARC-Authentication-Results: i=2; open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Authentication-Results: open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Received: from simonwunderlich.de (simonwunderlich.de [79.140.42.25]) by diktynna.open-mesh.org (Postfix) with ESMTPS id BDD8D80137 for ; Mon, 27 Apr 2020 17:06:10 +0200 (CEST) Received: from kero.packetmixer.de (p4FD5799A.dip0.t-ipconnect.de [79.213.121.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by simonwunderlich.de (Postfix) with ESMTPSA id 816166206F; Mon, 27 Apr 2020 17:06:10 +0200 (CEST) From: Simon Wunderlich To: davem@davemloft.net Subject: [PATCH 2/5] batman-adv: Fix spelling error in term buffer Date: Mon, 27 Apr 2020 17:06:04 +0200 Message-Id: <20200427150607.31401-3-sw@simonwunderlich.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427150607.31401-1-sw@simonwunderlich.de> References: <20200427150607.31401-1-sw@simonwunderlich.de> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YoPVlrASzv1AW0pTq64vO9ZmYRZICd4VR1sc9YeBJMk=; b=1L/QXyIZttNdN5AhCtsCM6Lu0QlnWc1KJU2Co2e+LKzw+Ki1aygkREIbAuDsGh71c3FAI2 8GxGLR5wk7MPihoiMBY9wLrjm7b5KQHDFf5Aq/qn4fr7D7YGdR+v/w6vD4AFiMyz1G61yf BhDpSRP2PtNpeF281TaktGhydkaJvhs= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1587999970; a=rsa-sha256; cv=none; b=XxmUZpFULQ9skpYKCWfLQXbTpjjtA9dTKi7EKV8G9BgTjaOQINXOYZZCBWyjSFNE4W3vEX sWI3v0O3g8UEP3iZKwxWPSe2xrrJN9LBx/ALwZcY2b+ZKMRdKmtiMQFQ46dILDQ9VBUZoh 2SVvxJlP1NxxUeCQ9DSkrURgYzydd60= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; spf=pass (diktynna.open-mesh.org: domain of sw@simonwunderlich.de designates 79.140.42.25 as permitted sender) smtp.mailfrom=sw@simonwunderlich.de Message-ID-Hash: PJQHYFH3O4SFROVWPWMZ466ENOBFSDCT X-Message-ID-Hash: PJQHYFH3O4SFROVWPWMZ466ENOBFSDCT X-MailFrom: sw@simonwunderlich.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Sven Eckelmann checkpatch warns about a typo in the word bufFer which was introduced in commit 2191c1bcbc64 ("batman-adv: kernel doc for types.h"). Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 4a17a66cc572..d152b8e81f61 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1086,7 +1086,7 @@ struct batadv_priv_bla { * struct batadv_priv_debug_log - debug logging data */ struct batadv_priv_debug_log { - /** @log_buff: buffer holding the logs (ring bufer) */ + /** @log_buff: buffer holding the logs (ring buffer) */ char log_buff[BATADV_LOG_BUF_LEN]; /** @log_start: index of next character to read */ From patchwork Mon Apr 27 15:06:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 18093 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 1216880E2C; Mon, 27 Apr 2020 17:06:19 +0200 (CEST) ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=open-mesh.org; s=20121; t=1587999973; b=f0f/goRM2FgtxeNZPeiBb7VobzUJUaYvRkrTCLt59MSuqPAg9M06byqtH5hkVeFufuUSg LV9YEfevb3E0mzJRA3u4TrdM5KHzAXwlWozWDK1ScfYMKC4ft1G4veVfiVhr4+pHpOqb/Zd PBp8cFfx0Zv8l2JZxCdqoCwJESLwlZg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999973; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=oV+EhhG3DXbOn9zEfpaHhJmAh0QG0gCvXWlvJKTaNDM=; b=aDIkksTRiaNk0g0NdkbpqJChh/5p7Vw/JHje6dHIUxpVJ/Y70MA2A6BN3JO3nyHpevzHS P1bu88y6R0dEU57/kbbKjn3FJLyc6bwbNruzjVeETt5nkEoPmQ5jzc1LZEFl0cZJhuaMkw2 0MvSAW1q8PMRP0FrcdjfZEKnwqBVpyw= ARC-Authentication-Results: i=2; open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Authentication-Results: open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Received: from simonwunderlich.de (simonwunderlich.de [79.140.42.25]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 5D4B480137 for ; Mon, 27 Apr 2020 17:06:11 +0200 (CEST) Received: from kero.packetmixer.de (p4FD5799A.dip0.t-ipconnect.de [79.213.121.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by simonwunderlich.de (Postfix) with ESMTPSA id 26C6A62070; Mon, 27 Apr 2020 17:06:11 +0200 (CEST) From: Simon Wunderlich To: davem@davemloft.net Subject: [PATCH 3/5] batman-adv: trace: Drop unneeded types.h include Date: Mon, 27 Apr 2020 17:06:05 +0200 Message-Id: <20200427150607.31401-4-sw@simonwunderlich.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427150607.31401-1-sw@simonwunderlich.de> References: <20200427150607.31401-1-sw@simonwunderlich.de> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JVNwxgOndOZaQvqpFfbtqvHGQstYLQWFUVTB0YGoqrk=; b=vXJZCzstZdMicnrIAlEDJVxeG4m9bWpskXd+oLDFo7IgNqGXVymSJhYroTaA3DQ0gMLfme 6gAhs+33oyMFuImw5A76D2W9fQQzxHoDiG/PdU8mehO9HUgBrVxUXZHQD5a7nZ1JM/tgKD lSByWmyyqsbbyiqPD8ekhIROy1JJ9+A= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1587999971; a=rsa-sha256; cv=none; b=kT6ucrh3pac8oywSs3LSA4Br5P8ozrbz+yyAKQhH5RDUG39gBgs7bowiH17rAEwvLz+IOQ rYKgl3/XzeT2bkvmb9tem/jxsKDyB4tuzeq5EUEDdRsRaiEewbY52eUjtQKQD8wFSUMeei FI+Pw6VP6F4ZERqzhVoKwDOE8mvvD2A= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; spf=pass (diktynna.open-mesh.org: domain of sw@simonwunderlich.de designates 79.140.42.25 as permitted sender) smtp.mailfrom=sw@simonwunderlich.de Message-ID-Hash: E4AL7C2FUD3UBZRI2WVRQTQWPTVSPRWO X-Message-ID-Hash: E4AL7C2FUD3UBZRI2WVRQTQWPTVSPRWO X-MailFrom: sw@simonwunderlich.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Sven Eckelmann The commit 04ae87a52074 ("ftrace: Rework event_create_dir()") restructured various macros in the ftrace framework. These changes also had the nice side effect that the linux/types.h include is no longer necessary to define some of the types used by these macros. Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/trace.h | 1 - 1 file changed, 1 deletion(-) diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index f631b1e01b89..a87547570b4e 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -15,7 +15,6 @@ #include #include #include -#include #undef TRACE_SYSTEM #define TRACE_SYSTEM batadv From patchwork Mon Apr 27 15:06:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 18094 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 8745581037; Mon, 27 Apr 2020 17:06:24 +0200 (CEST) ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=open-mesh.org; s=20121; t=1587999973; b=Cqk/kkStxp6jUv2cMrPdvpotIgqbkLnsNRvoO7yinZ+0VM42fk384KsYV0dpMhm5PYYNe dm5QPpUqf8CM6bD8QroWyNjQPYrOTOWq7c8CHcY6i+7kohsQSAgzUSGJ4QkN+gQR2I5n+5S QJ7Ed4afTAanJiJwS4UUw/98VgwaWfk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999973; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=BoPS+VvBEOmFNvGPUGe2VqfbYQwnNoXfIi/hKC7Iamw=; b=XRKiVZKMOsJ1Y5tMF94MmALFIZTEI/iRplnf56pO2PapVDZJM9RYntGoXW21o4p268qlY PDJWjKYzU9i/67OyBr7fcBe6fR9JeNCXV2zwaU/l0vsdUvHvHj85vsHmcEH+/QtG1RpAFrc Cii+WFbaOMYjB+iWuc3hzO+JGKexx3E= ARC-Authentication-Results: i=2; open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Authentication-Results: open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Received: from simonwunderlich.de (packetmixer.de [IPv6:2001:4d88:2000:24::c0de]) by diktynna.open-mesh.org (Postfix) with ESMTPS id E6EEC80C7D for ; Mon, 27 Apr 2020 17:06:11 +0200 (CEST) Received: from kero.packetmixer.de (p4FD5799A.dip0.t-ipconnect.de [79.213.121.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by simonwunderlich.de (Postfix) with ESMTPSA id AE90062071; Mon, 27 Apr 2020 17:06:11 +0200 (CEST) From: Simon Wunderlich To: davem@davemloft.net Subject: [PATCH 4/5] batman-adv: Utilize prandom_u32_max for random [0, max) values Date: Mon, 27 Apr 2020 17:06:06 +0200 Message-Id: <20200427150607.31401-5-sw@simonwunderlich.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427150607.31401-1-sw@simonwunderlich.de> References: <20200427150607.31401-1-sw@simonwunderlich.de> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mtSkTGMNQ+S4x50rYhfmm89/I8xz+SL6kzJFMaGRlsE=; b=2Qu+WJAqh6Mq70WXhXCFUSxLwUmt3Di1jbpXGUihlvWwd30XWP/9wi+vhHikdbz4BdOHfe 4zJrMXw/9WMQ+CEx1oWuOve5T3fvvSFjmt+JlJwFzR6m4e+tkaLTGWXzj/anrLxw1lm+xI y5byq21bUDwOjOW/3RvSnF/HkP+JJZA= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1587999971; a=rsa-sha256; cv=none; b=H4WatxhIQbDpckaoVXr528z8nMdI205wH5VPOElX1jBNehZpKN4URppQPDN9QOHJMqFKYC Jc7ZPielLr9DU5iSquUkm3TcDFofJGDVnYnxrkTpQAKAquZCstsVSWuyqdIb1J8peSeHXD MSIygsyQDKmEwDMSRRm6IQR+JdsSNz0= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; spf=pass (diktynna.open-mesh.org: domain of sw@simonwunderlich.de designates 2001:4d88:2000:24::c0de as permitted sender) smtp.mailfrom=sw@simonwunderlich.de Message-ID-Hash: SG3Z3CCOMZ4ZX2H4AHZIO4UTG55GZPSR X-Message-ID-Hash: SG3Z3CCOMZ4ZX2H4AHZIO4UTG55GZPSR X-MailFrom: sw@simonwunderlich.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Sven Eckelmann The kernel provides a function to create random values from 0 - (max-1) since commit f337db64af05 ("random32: add prandom_u32_max and convert open coded users"). Simply use this function to replace code sections which use prandom_u32 and a handcrafted method to map it to the correct range. Signed-off-by: Sven Eckelmann --- net/batman-adv/bat_iv_ogm.c | 4 ++-- net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/bat_v_ogm.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index a7c8dd7ae513..e87f19c82e8d 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -280,7 +280,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += prandom_u32() % (2 * BATADV_JITTER); + msecs += prandom_u32_max(2 * BATADV_JITTER); return jiffies + msecs_to_jiffies(msecs); } @@ -288,7 +288,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) /* when do we schedule a ogm packet to be sent */ static unsigned long batadv_iv_ogm_fwd_send_time(void) { - return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2)); + return jiffies + msecs_to_jiffies(prandom_u32_max(BATADV_JITTER / 2)); } /* apply hop penalty for a normal link */ diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 1e3172db7492..353e49c40e7f 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -49,7 +49,7 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) unsigned int msecs; msecs = atomic_read(&hard_iface->bat_v.elp_interval) - BATADV_JITTER; - msecs += prandom_u32() % (2 * BATADV_JITTER); + msecs += prandom_u32_max(2 * BATADV_JITTER); queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.elp_wq, msecs_to_jiffies(msecs)); diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 969466218999..0959d32be65c 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -88,7 +88,7 @@ static void batadv_v_ogm_start_queue_timer(struct batadv_hard_iface *hard_iface) unsigned int msecs = BATADV_MAX_AGGREGATION_MS * 1000; /* msecs * [0.9, 1.1] */ - msecs += prandom_u32() % (msecs / 5) - (msecs / 10); + msecs += prandom_u32_max(msecs / 5) - (msecs / 10); queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.aggr_wq, msecs_to_jiffies(msecs / 1000)); } @@ -107,7 +107,7 @@ static void batadv_v_ogm_start_timer(struct batadv_priv *bat_priv) return; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += prandom_u32() % (2 * BATADV_JITTER); + msecs += prandom_u32_max(2 * BATADV_JITTER); queue_delayed_work(batadv_event_workqueue, &bat_priv->bat_v.ogm_wq, msecs_to_jiffies(msecs)); } From patchwork Mon Apr 27 15:06:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 18095 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from diktynna.open-mesh.org (localhost [IPv6:::1]) by diktynna.open-mesh.org (Postfix) with ESMTP id 0C2D481048; Mon, 27 Apr 2020 17:06:30 +0200 (CEST) ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=open-mesh.org; s=20121; t=1587999973; b=it//YA1z9dVyEG2KZU8d5doKcJh9UX18kjFjdB9L+9Fd1b5mw+L4wdEf1m8qqwBJ0bQJc Rsp2hibyLHlIe4fuiCwfAVPxU7il/CmUaOGR7xRpuyUVkYTo892hNpRtCU2j4KRPLmiOoGd bt5cpACb3H26tuiQXzr/d4la+TYhIwI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999973; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=xOKBUZst3EcdMALOG4f6wpJFc7qNP01Ims43C1QGdhA=; b=wWK7Chg2ttzimkfHrrTPYwlDvp6Alner41rImARKN1g/m2UGUiRsVJnbcblXLJnOAxzYZ lFzlVkmzk3Hvoz0IcKlg3qjQ263b26uB/k7G9M2rNiuSWviwrZXlmUQSWwKtaeJsvYjIuoq L1vEPhx5K0JYsrYyVRfGISpxlBonKF0= ARC-Authentication-Results: i=2; open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Authentication-Results: open-mesh.org; dkim=fail; arc=fail; dmarc=fail header.from=simonwunderlich.de Received: from simonwunderlich.de (simonwunderlich.de [79.140.42.25]) by diktynna.open-mesh.org (Postfix) with ESMTPS id 7DFFC80DEE for ; Mon, 27 Apr 2020 17:06:12 +0200 (CEST) Received: from kero.packetmixer.de (p4FD5799A.dip0.t-ipconnect.de [79.213.121.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by simonwunderlich.de (Postfix) with ESMTPSA id 464F962058; Mon, 27 Apr 2020 17:06:12 +0200 (CEST) From: Simon Wunderlich To: davem@davemloft.net Subject: [PATCH 5/5] batman-adv: remove unused inline function batadv_arp_change_timeout Date: Mon, 27 Apr 2020 17:06:07 +0200 Message-Id: <20200427150607.31401-6-sw@simonwunderlich.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427150607.31401-1-sw@simonwunderlich.de> References: <20200427150607.31401-1-sw@simonwunderlich.de> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=open-mesh.org; s=20121; t=1587999972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AbLBY1fZ6oAmp5LnA8cVeMLU2GstwpHeCtb/iiMm0xs=; b=KnNM051+0mnobiNMv/018RKeQzhWlezjTlXgPHKjFJy/LK8HRtNyD3wSu+dXUTd8PktHIv +ZBsBt0IaCvJRgs7KqwykTEo/eB7e4xYMXOqXupiTYbJnc5C85Kc3pL5DRixRnvU+fAcZ7 lmhgpWGmdS1/FmzpsBrusJ8av/g//iA= ARC-Seal: i=1; s=20121; d=open-mesh.org; t=1587999972; a=rsa-sha256; cv=none; b=MZjqS72574+TmzwZt9stcZxDl+rlAbqKy+5l5ZsvA90emdyQl/d+NcPhaso4bNqSL3OQBY UNqzbHpgInOGlc/tNpQCmVaAXLduKU0jVkWkxtpyORf1nMzu1SvFk9zcer6WkyV3kK0BQP 4bzazUuJS4lmDpELPCwLDQpb566ldj8= ARC-Authentication-Results: i=1; diktynna.open-mesh.org; dkim=none; spf=pass (diktynna.open-mesh.org: domain of sw@simonwunderlich.de designates 79.140.42.25 as permitted sender) smtp.mailfrom=sw@simonwunderlich.de Message-ID-Hash: QX4IQ4E547ESUSKZEIZVMIC4RKO5VEZO X-Message-ID-Hash: QX4IQ4E547ESUSKZEIZVMIC4RKO5VEZO X-MailFrom: sw@simonwunderlich.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-b.a.t.m.a.n.lists.open-mesh.org-0; header-match-b.a.t.m.a.n.lists.open-mesh.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org, YueHaibing X-Mailman-Version: 3.2.1 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: YueHaibing There's no callers in-tree. Signed-off-by: YueHaibing Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich --- net/batman-adv/distributed-arp-table.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 2bff2f4a325c..4e031661682a 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -163,11 +163,6 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv, { } -static inline void batadv_arp_change_timeout(struct net_device *soft_iface, - const char *name) -{ -} - static inline int batadv_dat_init(struct batadv_priv *bat_priv) { return 0;