From patchwork Tue Apr 24 13:17:47 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: 903450 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="e5ntg7L+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkj714kWz9rxx for ; Tue, 24 Apr 2018 23:30:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933962AbeDXNRz (ORCPT ); Tue, 24 Apr 2018 09:17:55 -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-Google-Smtp-Source: AIpwx48NxL44yGJmMl3ju1Gvt6RKZ+JlIO87Lkctl38+bqM+3cYTwxmO7un/ANlgpdjq/Uesdvhwvg== 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: 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: Greg Rose --- 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;