From patchwork Wed Jan 10 04:06:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 857927 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="J5QKL7mP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zGb6Z0mZDz9s8J for ; Wed, 10 Jan 2018 15:06:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965295AbeAJEGS (ORCPT ); Tue, 9 Jan 2018 23:06:18 -0500 Received: from ozlabs.org ([103.22.144.67]:59071 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965124AbeAJEGR (ORCPT ); Tue, 9 Jan 2018 23:06:17 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3zGb6H2G81z9s8J; Wed, 10 Jan 2018 15:06:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1515557175; bh=rp2l9lBlORAbo+oZyQ3w1yDQXsIsZohyo2nJkTGgPgU=; h=Date:From:To:Cc:Subject:From; b=J5QKL7mP6P6nj2+4Fa1dOROp4rD4PtmwxL4vt4/yXQOPRxYC7dTWChVNSmMgO86sf 7kGobWB2kkmvwOZWDIflUYNWa+9cm8nRBBNQ4uJWzk1RSRvc/6+55y7f364+xRLdCz 87wZeDN92cyZNV8MiZKRY0zTLNc1SWgHf+NC7aAV0ePTY68g0Uc9H0fdexL2pCFT4r 91kq2xSj84A/RjWAAO55zW5ArFyn8VeJny6Q/X2DfAo57le8vGcNo4DqjYweNmCUH8 ceqfXFPawGR7dWUrLA7a4Tv65TOPMTDXGAeJztRIXeyB7Rj0tZjByW9ziEkZoHVQfA 6dJkcwKLvU9nQ== Date: Wed, 10 Jan 2018 15:06:14 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Jason Wang Subject: linux-next: build failure after merge of the net-next tree Message-ID: <20180110150614.3fb5d9f1@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, After merging the net-next tree, today's linux-next build (sparc64 defconfig) failed like this: net/socket.o: In function `tun_xdp_to_ptr': (.text+0x3180): multiple definition of `tun_xdp_to_ptr' fs/compat_ioctl.o:compat_ioctl.c:(.text+0x0): first defined here net/socket.o: In function `tun_ptr_to_xdp': (.text+0x31a0): multiple definition of `tun_ptr_to_xdp' fs/compat_ioctl.o:compat_ioctl.c:(.text+0x20): first defined here Caused by commit fc72d1d54dd9 ("tuntap: XDP transmission") I applied the following fix for today: From: Stephen Rothwell Date: Wed, 10 Jan 2018 15:01:41 +1100 Subject: [PATCH] tuntap: fix for "tuntap: XDP transmission" Signed-off-by: Stephen Rothwell Acked-by: Jason Wang --- include/linux/if_tun.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 08e66827ad8e..c5b0a75a7812 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -42,11 +42,11 @@ static inline bool tun_is_xdp_buff(void *ptr) { return false; } -void *tun_xdp_to_ptr(void *ptr) +static inline void *tun_xdp_to_ptr(void *ptr) { return NULL; } -void *tun_ptr_to_xdp(void *ptr) +static inline void *tun_ptr_to_xdp(void *ptr) { return NULL; }