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: 903435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="e5ntg7L+"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40VkQn5ksNz9s28 for ; Tue, 24 Apr 2018 23:17:52 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 64916255; Tue, 24 Apr 2018 13:17:51 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 4C7D882 for ; Tue, 24 Apr 2018 13:17:50 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C481E671 for ; Tue, 24 Apr 2018 13:17:49 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id b21so810292wme.4 for ; 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=egZuD1U6xvvJjxqBULfXAdkaTW3CyyXIoss9B/rnyKc7LV6/dguBK3tGBOr1TUiX83 90Ci0RC9sXi2a1NbY9tV53bcOeHT+zaYluhiClxsX8PRY+j3lpi7nCaWlZEbsZXk78s3 eWyps+1UQ9ljD3tgmV+kFjG1lWJ3zBjLBkzuc2aOFZl7b8VRShsER+MgphosenEcnEiP DZqiC5+TLjGrn3U6Hgu4YyKd/A4346/OPgKP8yq6b0Z0++4WuvjfjbDFzBPv27tvJQlR XjCHKQ/ytbXl4JA0xXgmefvrxqGQHfj0KkXSlJqIHLaRk5pr3E3onkFdde2ydeTkXQaE AzYg== X-Gm-Message-State: ALQs6tDstknItcVBiGRJGW5ZHHzmRxKQKfiyj/f/U3wIcC/d0Be6jY69 2TE0dvXQKvmky6GPR7BsA8c= 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 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 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: dev@openvswitch.org, netdev@vger.kernel.org, "David S. Miller" , Luc Van Oostenryck Subject: [ovs-dev] [PATCH] openvswitch: fix internal_dev_xmit()'s return type X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.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;