From patchwork Tue Apr 24 13:17:33 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: 903455 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="KVaRk5AA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VklW6604z9rxx for ; Tue, 24 Apr 2018 23:32:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933928AbeDXNRp (ORCPT ); Tue, 24 Apr 2018 09:17:45 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33452 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933910AbeDXNRh (ORCPT ); Tue, 24 Apr 2018 09:17:37 -0400 Received: by mail-wm0-f66.google.com with SMTP id x12so511200wmc.0; Tue, 24 Apr 2018 06:17:35 -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=1XXJXNr4cerNGZ6zKwH8vS9+IwO2UyBzBhX6F+sTUFI=; b=KVaRk5AA2hwG7chJlqa4PBqL6KRixkajghpkqa+0YjvnZtFhuodGodjh6bfPjlLVZF fs6KaWDaASvf7pnZMEHUX0Pl5YmV+0fU5/u/O+8TD34BSLoB+/h2xlEra7fgHWuJCI4k EVtbFkSjp3t6ubpHW0r1dpLC7M+iDyJdK2+eQQ4mrMcRUAAtX27+2MaASRUffv51Sded TXJZlmae+Gc/GXnVv/gK/BVJDRllObStvkJkrZUmBue1pYz8KrHpHgYKi2nmFqOpBrvm lRR3y0zlR5nrsaYL/eRQGOWoOn0MRjdOv3S0UhGvhACvz1r3KKjWPHCOwgkjgkWCYzgb FOlA== 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=1XXJXNr4cerNGZ6zKwH8vS9+IwO2UyBzBhX6F+sTUFI=; b=sl1Ns338qh2nUa4ZuSxaBoQdnejiwk6VGfFIBS06L0Z3fDbv/i0MKB/lu2ZwPym9aB UAd0p180SuQk0LI23s8QBGHfg3WrQWFakiv9UFVdS9RBvxf0pfk9VOFaxyTqdRc4OT2J VWXQqxyZxiTkAO6WI+tBDPh+b+5uTUC+BOdXMLtn+2IyxhlsHjpw7sK9fbV2tzup9uzs OXFWZ6hucy1AzgvTFAb39ZhgW6F23yNytofuPwuUnzKnPLgx3WRua6P03NAT9PLm168B lO03PAyIQSeo4KPdMHAigvTG/n1YzmLbog7PdkivenA5cpP15FIgXPbBHUo/3p7EVRE3 P09Q== X-Gm-Message-State: ALQs6tBocIMGdweOt3DW+gHgnNWAV29dAW48b9Jd/FZ7D6Fd8z22Bw77 CuHkLCl4hYuwg9MVpPEL7QS0vK8QZHk= X-Google-Smtp-Source: AIpwx4/LjNMpel/ht/OaswJydB0tMxk4DJ7Ny3ZuwWlowiYt+bAzPTXHcJaBLE9hX1iumiH1ev2cbA== X-Received: by 10.80.139.249 with SMTP id n54mr33320825edn.216.1524575855031; Tue, 24 Apr 2018 06:17:35 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id j90sm8635367edb.12.2018.04.24.06.17.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:17:34 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Jose Abreu , netdev@vger.kernel.org Subject: [PATCH] net: dwc-xlgmac: fix xlgmac_xmit()'s return type Date: Tue, 24 Apr 2018 15:17:33 +0200 Message-Id: <20180424131733.4510-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 --- drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c index 1f8e96015..7429c2094 100644 --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-net.c @@ -697,7 +697,7 @@ static void xlgmac_tx_timeout(struct net_device *netdev) schedule_work(&pdata->restart_work); } -static int xlgmac_xmit(struct sk_buff *skb, struct net_device *netdev) +static netdev_tx_t xlgmac_xmit(struct sk_buff *skb, struct net_device *netdev) { struct xlgmac_pdata *pdata = netdev_priv(netdev); struct xlgmac_pkt_info *tx_pkt_info;