From patchwork Tue Apr 24 13:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 903446 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dlV7JiuK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkgn2qXgz9rxx for ; Tue, 24 Apr 2018 23:29:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934271AbeDXN2x (ORCPT ); Tue, 24 Apr 2018 09:28:53 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:37488 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934012AbeDXNSR (ORCPT ); Tue, 24 Apr 2018 09:18:17 -0400 Received: by mail-wm0-f68.google.com with SMTP id l16so813718wmh.2; Tue, 24 Apr 2018 06:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZrCos1yTJ1DWX+R646V59t+6vPG4xj4hvudA5IeZIlU=; b=dlV7JiuK9CPYkoeE+qq0mLcFh5/Uy3e0P7Zm7mxV2lI2iXzyv15wQVjgUhoKXET+5V 9mbaohm+BpOMYW935PZnSfjcmKFWBUPMJUhZ2pcJBTSpw9IRCFz8R1K7A4BAsfxV3dXe v32U9y65cdYRxrEfAseh1vE1NeoxWTMRv+sQK9BoBiwi3VaQDS/ekyajemnO/BGqghWl BFRknV5W2xbBjBoZzw1eArzn9FZDDjLQxok7ZR+AcN7kKZJPN1zN4Ieku2HNa8o9n+Qu 8j1qKZ9C6tJVrvCB0mE0nLTgPKbdlq2JgW+TGEnFR379/oG3gzsRUv7lavoyMVLAyjTu 7TGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZrCos1yTJ1DWX+R646V59t+6vPG4xj4hvudA5IeZIlU=; b=M9PPemgwICyoz5+Lb2Bl9cQIH0L3BBOLosH/VUa3iUeQdXfRlinbiaB63/L0rD7V9G AV1U4tKf+Y0om/tazCi8WdQbwxf+/YSR5jEhaadf5xu281agVPfMpwwxL4Cs549TKtaA 6vJd476/JxXTVmVrFrYhLg5aJCTPuV7KLB1ZfWOlVc1Rvl1HPNbUAKZqkqfLyGBQgD6X g43eRltIoRPQSOhap2gRT1yUn12jSPX6hDaq5aXl9FUhGuTK7wLPcaIaVPi7X3Bm484P gtcml8VWtFDF0z6tEOEkvI4aCxPRjYGbuLIFTltMOAWCTxTnq7JiDEa+2j8O9GlNi75P HSnQ== X-Gm-Message-State: ALQs6tC0HqTq3bv5ByAFAUrVxQjz9Hh5eZccQmWV00qN85pboeGzxHbH MXQ3VnDUOCiDV5h8Urg5KS6R6FeHwLE= X-Google-Smtp-Source: AIpwx48zqvKIFZOBndbs61/+BbL9FaVrCJE85wk649/xdBM6kLwWtSrhXtQoqcPy0EEMH3AILNjyCQ== X-Received: by 10.80.164.93 with SMTP id v29mr26776098edb.92.1524575896316; Tue, 24 Apr 2018 06:18:16 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id j2sm4606108edp.22.2018.04.24.06.18.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:18:15 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Boris Ostrovsky , Juergen Gross , xen-devel@lists.xenproject.org, netdev@vger.kernel.org Subject: [PATCH] xen-netfront: fix xennet_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:18:14 +0200 Message-Id: <20180424131815.5064-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck Reviewed-by: Wei Liu --- drivers/net/xen-netfront.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 4dd066800..679da1abd 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -564,7 +564,7 @@ static u16 xennet_select_queue(struct net_device *dev, struct sk_buff *skb, #define MAX_XEN_SKB_FRAGS (65536 / XEN_PAGE_SIZE + 1) -static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct netfront_info *np = netdev_priv(dev); struct netfront_stats *tx_stats = this_cpu_ptr(np->tx_stats);