From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FCDAC7618F for ; Fri, 26 Jul 2019 21:10:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2750322BF5 for ; Fri, 26 Jul 2019 21:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728290AbfGZVKy (ORCPT ); Fri, 26 Jul 2019 17:10:54 -0400 Received: from shards.monkeyblade.net ([23.128.96.9]:55122 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728181AbfGZVKy (ORCPT ); Fri, 26 Jul 2019 17:10:54 -0400 Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::d71]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id A02F612B0259E; Fri, 26 Jul 2019 14:10:53 -0700 (PDT) Date: Fri, 26 Jul 2019 14:10:53 -0700 (PDT) Message-Id: <20190726.141053.972271542982124792.davem@davemloft.net> To: arnd@arndb.de Cc: willy@infradead.org, netdev@vger.kernel.org Subject: Re: [PATCH] Build fixes for skb_frag_size conversion From: David Miller In-Reply-To: References: <20190724113615.11961-1-willy@infradead.org> X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Fri, 26 Jul 2019 14:10:53 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann Date: Thu, 25 Jul 2019 13:08:18 +0200 > On Wed, Jul 24, 2019 at 1:37 PM Matthew Wilcox wrote: >> >> From: "Matthew Wilcox (Oracle)" >> >> I missed a few places. One is in some ifdeffed code which will probably >> never be re-enabled; the others are in drivers which can't currently be >> compiled on x86. >> >> Signed-off-by: Matthew Wilcox (Oracle) > >> diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c >> index cc12c78f73f1..46a6fcf1414d 100644 >> --- a/drivers/staging/octeon/ethernet-tx.c >> +++ b/drivers/staging/octeon/ethernet-tx.c >> @@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) >> >> hw_buffer.s.addr = >> XKPHYS_TO_PHYS((u64)skb_frag_address(fs)); >> - hw_buffer.s.size = fs->size; >> + hw_buffer.s.size = skb_drag_size(fs); >> CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64; >> } >> hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb)); > > Kernelci noticed a build failure from a typo here: > https://kernelci.org/build/id/5d3943f859b514103f688918/logs/ I just checked this into net-next: ==================== >From 1fbf400b58fa70c35bf671ff640b83799e45388d Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 26 Jul 2019 14:10:30 -0700 Subject: [PATCH] staging: octeon: Fix build failure due to typo. drivers/staging/octeon/ethernet-tx.c:287:23: error: implicit declaration of function 'skb_drag_size'; did you mean 'skb_frag_size'? [-Werror=implicit-function-declaration] >From kernelci report: https://kernelci.org/build/id/5d3943f859b514103f688918/logs/ Fixes: 92493a2f8a8d ("Build fixes for skb_frag_size conversion") Signed-off-by: David S. Miller --- drivers/staging/octeon/ethernet-tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 46a6fcf1414d..44f79cd32750 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)skb_frag_address(fs)); - hw_buffer.s.size = skb_drag_size(fs); + hw_buffer.s.size = skb_frag_size(fs); CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64; } hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb)); -- 2.20.1