From patchwork Tue Apr 24 13:18:53 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: 903442 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="ibCn1+au"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkb62631z9rxx for ; Tue, 24 Apr 2018 23:25:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758081AbeDXNZC (ORCPT ); Tue, 24 Apr 2018 09:25:02 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:53834 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933911AbeDXNS6 (ORCPT ); Tue, 24 Apr 2018 09:18:58 -0400 Received: by mail-wm0-f68.google.com with SMTP id 66so911949wmd.3; Tue, 24 Apr 2018 06:18:57 -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=mBQLOeQruo9oEXSXBFHQAf6pQpaipFeKDgIQK7LhIF0=; b=ibCn1+aulK8PgpTvW3Qj7b5BRUiXAMPBRDnqsVXqwB2+jEgkX5ipb9Z555JEBDsEjS TRqPdX32/fS/HXvL4HP3iwfvLKT2Dre/n/dBJ12RDC5ZopOYZG+aQqPfGZUFijSuVCkK 7UnhOVcVlxfoiWlU7jPioEYkHRdKncH3YbI6r0o6exOJBfqGPNo6HLDBW5gVRqD2JTYV a7TbZtOBEk6ArAbAN3Xv5u7+hUG9Y7M5ONOBNow6mj0RQVhOVS6uV9nhZyqvDffQddj4 8kvfbJYH2Ij6b/W8hjWvzt0gcyu4bvaMlPJJToTUMJeKz+zGDHbpmJ+AgZ54JaiojUIE r1GQ== 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=mBQLOeQruo9oEXSXBFHQAf6pQpaipFeKDgIQK7LhIF0=; b=WQvOCN7n0IYDGIiqKDNhWDTpsyHufnizqpcSzHXUlcBf/o/SMDgSpBl6B51huDPatE GQZ5pTuGfGicsjCEw+c0XozsgXfHdgjHqXnIZymX2mvvSL1PKYIa7ll6jZsR3AlWOSQG YzN07C13b7VMpyE7VhzMY7NpAVN1kdYfCl+1f68eTKqaBGUfQQGZn8rxxXZCvwLUzEZ9 3YGXRPxAOz9eMG+u1IwIPUlO4sHrezGOSaM+iAgO0gIC2KTVO3gu8XNpujjjo682bEvn lGzBUZU11tj4ExNMkSVzJFuqyi9/XWaHIGjCQePeiwPYmCI31UysvA+apVrsIZ/jF8hK PkJg== X-Gm-Message-State: ALQs6tA17px9RyiCh9Ux6qIbOATDgB5hyAT8COkMBvV43Xr0gCuAGs90 g/8tL/aqvWA+7Yf0ZzPnMVaW0KxyHKI= X-Google-Smtp-Source: AIpwx4+AB5GRpKqAOaOPV5aWxa34iv1SwKlUYeFixvpbItvonSE8BYDe7G2XmyvwGLGWg/UTrx+Meg== X-Received: by 10.80.134.220 with SMTP id 28mr34263463edu.177.1524575936778; Tue, 24 Apr 2018 06:18:56 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id g7sm6163164edf.90.2018.04.24.06.18.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:18:56 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , "David S. Miller" , Guillaume Nault , James Chapman , Dominik Heidler , netdev@vger.kernel.org Subject: [PATCH] l2tp: fix l2tp_eth_dev_xmit()'s return type Date: Tue, 24 Apr 2018 15:18:53 +0200 Message-Id: <20180424131855.5618-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 --- net/l2tp/l2tp_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 5c366ecfa..e027f8b54 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -77,7 +77,7 @@ static void l2tp_eth_dev_uninit(struct net_device *dev) */ } -static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct l2tp_eth *priv = netdev_priv(dev); struct l2tp_session *session = priv->session;