Received: by 10.192.165.148 with SMTP id m20csp4755795imm; Tue, 24 Apr 2018 07:58:01 -0700 (PDT) X-Google-Smtp-Source: AIpwx49uSAbiLprBZotoymRPH4YXFqiHCYaBslpeSLsAQ6do3grkw4sg5ayvjFyQ/2QbYOaFkpCD X-Received: by 10.99.185.8 with SMTP id z8mr20555291pge.436.1524581881672; Tue, 24 Apr 2018 07:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524581881; cv=none; d=google.com; s=arc-20160816; b=e3HpEqp7e3lxlvHaV5ts16yylvaWvYS4wgroyFcv9Xcpm8xDE3wNB9Fxn0xv3uZxPL wFmVMldPJ+dAFEl/4FcQV2U7mvXLcoBmkz0kOErFYGdvt0QJSlMzCEf8J42fWs43gEs6 bKUbsF6+7ZxjgAmmIn7koaHH7fXFK/+AbPPWWx+8Gwyvem0SutriYOg8jkxZxH9C8D2Y Vde0G3aAsRU5YiwdqiKRz7kuOTy/HDf8P0QDVCmxCNEn1tDAup/DlAYgtDs6Dl0thtYB WhkBQbUzTnj9DQBwFlvYAY8RwPGHLaG/yL62vtP66a59+1Vc8tEuL5AGCunRYVAI4PkX RKRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=S79i3h14UfEAuzNQ2mHJV/SSXzwqaz28Gj2HNLP80SM=; b=I2weZolgBW+PNneG6i7W/knuNyWdxFvggvQF4T6h4ZuCYAAimwHzJLtKW8H+V88bHt fGQNRq/VtlEeHy0xAF3OQZvTsQx5wrttllW4cQQ49hg2E3rZhjJtsvCS5WOsz3wir9RY GT8Zra+9BiJi2F5C9UYfZZ3nlbd3yUtYZ2rx2TT86j+eQ2VmPdkkM9Ec5k95mrDRVUFE 4nVJ0vgNoitmSl4jBrbxNUmf+qPrCFoo/BIh5kQPPDviFG/Sg3qGpDlBx5FhWN84XZfE dlntk9OFpxWWTNMiEb4b1Kjsziv79ecQTWifY2h6npe4kxiKO5lIGhTKmwLNgIO+0hwU 9ugg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=e5ntg7L+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i75si11396423pgd.399.2018.04.24.07.57.47; Tue, 24 Apr 2018 07:58:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=e5ntg7L+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933968AbeDXNR4 (ORCPT + 99 others); Tue, 24 Apr 2018 09:17:56 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35105 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933902AbeDXNRu (ORCPT ); Tue, 24 Apr 2018 09:17:50 -0400 Received: by mail-wm0-f65.google.com with SMTP id o78so807144wmg.0; Tue, 24 Apr 2018 06:17:49 -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=S79i3h14UfEAuzNQ2mHJV/SSXzwqaz28Gj2HNLP80SM=; b=e5ntg7L+DdWJFNfHH/4BVxhFGHOsOC97qmemApV6LGbc6kQEtymrjod1HmG6vi567J Zq+7QH1zkJTpTqkknvQ28kt5cwMEuiES7KWVR/e+pBsyf5XlvNqdAaiqXOhY0yOJlgzq YV2RKmp3p+cwS79skmjAV5fNwcZ9nlWPD1vkgUvXbM4srC0wL6Z8Ek99NDTZFB+pGxni bDu/psrChSEF7dlp1OJ7NUJSRCtb0E/0XxxgW4Y9sNMUt8/k1GxgJuBCcbRAghyfH2Qv oiLtQmS+UN4h35mg7ForjgoGMgAG19MijdUdeNm+8NBKFhNz5DlWuGqtMI1K5I5OddB0 Eiyg== 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=S79i3h14UfEAuzNQ2mHJV/SSXzwqaz28Gj2HNLP80SM=; b=agoOyV9RN4T4MquajEWAGRLjCsaoXoh6J4qW6YMSTYh3OfoVhNU+426OnXBI6UGGuq EX740V3Jo/cwDQ1q1DOL5HumjxYsEuMwyT6ilbt6yqvlVa3/X8iQlYQfHb4Ba/EBo1NA /N8rpDzWLiUI1IsAk65wIBuZMCUuknwhSBy3xHvEhOv9UwCVIuZb3kUI/82xSb6j1Mc+ KDt6tuq2I6LhuqatSPCIA0LlkA2z1mLzO+UM2Qv3DwedB2DLJDtmTiPvnsBmafkETP7D 4sf41fATLAfFymZzOp06qcUDwApeixlqr4hoh0HAdKL+KG86/q/7Fgy4DX5M84M6UvxQ DxIg== X-Gm-Message-State: ALQs6tBxc/jKtNhMCnBNCdSyCoZP+L2ssktaPPwOGdAlYk/qW1wL/D1B JKipALQ1gkwb+DBJbRC4PMjc7r8QGHc= X-Received: by 10.167.198.87 with SMTP id z23mr12380015edr.9.1524575868524; Tue, 24 Apr 2018 06:17:48 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id w1sm9231793edf.57.2018.04.24.06.17.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:48 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Pravin B Shelar , "David S. Miller" , netdev@vger.kernel.org, dev@openvswitch.org Subject: [PATCH] openvswitch: fix internal_dev_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:47 +0200 Message-Id: <20180424131747.4711-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- net/openvswitch/vport-internal_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index bb95c43aa..3ea55618e 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -43,7 +43,7 @@ static struct internal_dev *internal_dev_priv(struct net_device *netdev) } /* Called with rcu_read_lock_bh. */ -static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { int len, err; -- 2.17.0