From patchwork Tue Apr 24 13:18:12 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: 903436 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="JIAOEezS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VkRN4DTTz9s29 for ; Tue, 24 Apr 2018 23:18:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934039AbeDXNSV (ORCPT ); Tue, 24 Apr 2018 09:18:21 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54894 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934011AbeDXNSP (ORCPT ); Tue, 24 Apr 2018 09:18:15 -0400 Received: by mail-wm0-f66.google.com with SMTP id f6so908634wmc.4; Tue, 24 Apr 2018 06:18:14 -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=utmOcKaZHMnq6DaJMNWcu41XpN3SuNBNNqtzGR3pQ54=; b=JIAOEezS8Jh2fait42bls2OApZjpfntp9fKKJlbKtf6QwCS5DLdNqD0LM8OjOnRx03 Dc6OkJVEauZwHSNQW49wE25lTtoQHTYMnFQShlB4gGJ9nIf8yzs+Vzhfo6G3Yqyi+SXy PEcGv4BKk8FwIR50DR4cfRfJ5gaL84DfqlEOwH4c/zrAj7YaPXfHipUU4KIDFK3nzk21 Ab/SjNHiJIrc0QgYNqqGt156ZS8QBk+aLbYI9l1oKqn5DmBTorG5L4d5ZSnvsHhBo5FX c7l5ZifxQ0oLa3LEOrsQrQr2wfrPyi0POuVR/YDRb4OgJ0CMFyha2ofxFFUpu5sGHDhw eHUA== 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=utmOcKaZHMnq6DaJMNWcu41XpN3SuNBNNqtzGR3pQ54=; b=lFHwy46ANyfMIod2sxJiT12hzrzVt1xnna+gHir0vaXmGrP7g6BY5Oe7DiI2sAkaxx L72WwrztlBR84mNjDv4W/DbmtGPfSUWUddsJH3Fx7U8CTjimiBeoCAfMEZxay25BZLnS mqkdO+KW/dsIj9litgjeTTHzrFZydfJa2Kr8jONi+RQ4ttMaHKKvw6ZxEmGrycB9eXVj LyLIbXZp/RNUo7fAcTHEOlZ1ROYwiGME9pMBktd0RMKS1luWWcHBTmsIafQp24HLI7rP HVIHr/Z2PQePFLYf6AiqmRcUbrFqMjAl6gdZ4EkQjSJ0FqmZWact913qhbQDXuAlr1Os 6Nxg== X-Gm-Message-State: ALQs6tDyQY9pRI27qhNVEMcoQvBj/W3FS7R3HMOLLAZQVoDXTRfqqHxs oBTFKPkvhjJrUdFV+Z6Y8j44j7XyUjY= X-Google-Smtp-Source: AIpwx4/LBj3nqbOGLfgMHKLmVVJ1akg76k+c2j1PpWMpbMC+oFZE+kEdA7uC+ZpQS0YvzPlHXEgbQQ== X-Received: by 10.167.211.78 with SMTP id m14mr23118184edr.108.1524575893936; Tue, 24 Apr 2018 06:18:13 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id p1sm8002577edm.0.2018.04.24.06.18.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:18:13 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Wei Liu , Paul Durrant , xen-devel@lists.xenproject.org, netdev@vger.kernel.org Subject: [PATCH] xen-netback: fix xenvif_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:18:12 +0200 Message-Id: <20180424131812.5014-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 Acked-by: Wei Liu --- drivers/net/xen-netback/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 78ebe494f..bb944aa09 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -165,7 +165,7 @@ static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb, return vif->hash.mapping[skb_get_hash_raw(skb) % size]; } -static int xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct xenvif *vif = netdev_priv(dev); struct xenvif_queue *queue = NULL;