Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp14143499pxu; Mon, 4 Jan 2021 14:03:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwy+1iJjLOiy7RlT+le8nmzB7myHE4+Y2JM6w2PVincOFXDzctAd5lLlodUYgTs9dmZqiIf X-Received: by 2002:a17:906:298c:: with SMTP id x12mr68143637eje.244.1609797833201; Mon, 04 Jan 2021 14:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609797833; cv=none; d=google.com; s=arc-20160816; b=CbSFlx9U35tgE1JYS3S7NePhRwol2rdKYxeG5jX1OEL6Dp91cDYInm+1Uy8dE6R9kt 7VVvC2lDL0UmwyxcX4u3AaNYgH5AAATWxOZqAnHiu3OmE2ruz4ioOFnUNE4ibK+QJaq0 iNgk3xVa/KppfxxV8fWbn3LVylesEJRTblRs2NCtuJnvLqywPXrtaj27BI+H3xARYCc+ wNtxtyd+Gx390Wrx2A8SpgFfWJDU5GUO093kEa1q1JHXyeIiFY2lYhp6T/LaYBXkrOPA ja+9V7OktUC8EaRqwgu17i+eNEBvCa7hoRHItuWqtEPwdgBh9HWnX02JiWVWGyN5sgC4 821A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=HHW0DKzaZ0A+KYFYr4u4U2ch/qjqq7yxT9qKLt5WwyM=; b=Tx+lYa60R+lPH3VLaUwTykZPkynPIiW78iVkLGNoOL/VaN2lqDE29blmhSF6R0uQ2u QPM1mKAJFMbv84szwrVvAY/4XOuigBgnRiFtZS5hQYhgMymIiDF2AgzULY2hsf5+szWY 5OSSm4Wx0C27vC+3z8Ycf9NZAjuhiOPEbufhtSV+AGLCfavTbLLB3nuvs8MiS6BBiZP2 46ng47pfkOc2DEjJHXHXzqrp7H4BEvpQ7h7oVsDmJlSBMuFaRMrjVdmxkPzENoMDKGK+ xxn13scsJNXWFakt2EaR3PmfvZ0Iy+YsswzhqxJbj5ZwFVUuR4mmPXReakHMS8hQ4FtD futw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rZBxi2Tr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y15si28897483ejp.228.2021.01.04.14.03.30; Mon, 04 Jan 2021 14:03:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rZBxi2Tr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726663AbhADWBl (ORCPT + 99 others); Mon, 4 Jan 2021 17:01:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:43330 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726260AbhADWBk (ORCPT ); Mon, 4 Jan 2021 17:01:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 827552225E; Mon, 4 Jan 2021 22:00:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609797660; bh=TH62U7AAYl3N+Fpl/0Ilxx+FrsIwbFee0Efw7bO6Z8Q=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rZBxi2Tr5SufDqER3yBoGKYALmEwZ6ZciiLcmJOWbbM4HsNXePO1isKKBp3rzdEVT vch3kwYvWTRbHA+qZfqJqF/J5wRVNB4E7z/egEPH8Dcpj4QDN3nonmshKQQ8N+z7Q2 TEPwTUG4Swjg77fTer1PIEscPmwuFN2MsAs2vPLKYd5AUIc6Zyevq2DN0s4wP8d0gc JHNDz1K+tAkSM/SnaN9/a24bzKSeCrmVEnwbZZgWStsCw9Fyme0md+o2EzqJ5xSysd yd8HeS7FGJIKoQjLplN30HvrAk8YmoC/8HfCcC5utcBWM+wbl998l8uQx0LuTCc0Wn E6PbwKops1ONA== Date: Mon, 4 Jan 2021 14:00:58 -0800 From: Jakub Kicinski To: Jouni =?UTF-8?B?U2VwcMOkbmVu?= Cc: Oliver Neukum , linux-usb@vger.kernel.org, =?UTF-8?B?QmrDuHJu?= Mork , "David S. Miller" , Enrico Mioso , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot Subject: Re: [PATCH net,stable v2] net: cdc_ncm: correct overhead in delayed_ndp_size Message-ID: <20210104140058.34cb4111@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: <20210103202309.1201-1-jks@iki.fi> References: <20210103143602.95343-1-jks@iki.fi> <20210103202309.1201-1-jks@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 3 Jan 2021 22:23:09 +0200 Jouni Sepp=C3=A4nen wrote: > if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) > - delayed_ndp_size =3D ALIGN(ctx->max_ndp_size, ctx->tx_ndp_modulus); > + delayed_ndp_size =3D ctx->max_ndp_size + > + max((u32)ctx->tx_ndp_modulus, > + (u32)ctx->tx_modulus + ctx->tx_remainder) - 1; Let's use max_t, like Bjorn suggested.