From patchwork Tue Apr 24 13:18:46 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: 903443 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="Him7f7Fc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vkbb2jd8z9rxx for ; Tue, 24 Apr 2018 23:25:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934106AbeDXNSz (ORCPT ); Tue, 24 Apr 2018 09:18:55 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:55839 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934093AbeDXNSt (ORCPT ); Tue, 24 Apr 2018 09:18:49 -0400 Received: by mail-wm0-f68.google.com with SMTP id a8so918731wmg.5; Tue, 24 Apr 2018 06:18: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=mYnz5degboQ7Ion/nDA9QPi3KUbJtrSOrF8jl7HtGh4=; b=Him7f7Fcz6HvuQp+G0gX7ZTv21yY0EM+KUAd78h7Okn6eh2CCgdORezmkzAtJAWzvF PAisR4q+Esz/TB6+Wq70h/84yYxbc2gsKZGqqXfCuDFpsyDXcZGcdDsYD8h1NDb+CzwP ohCRY5I69k5GtrrPz6MTTCAArTrKKREd83ebZ+pDoX4ccb7x+2xDAvlkoqD8LITFkjcT nJGdNXOkw+l0eluFks7RfAM+/Jyx6l+shyh9oYQLe5kxnrlcYOzeTzkhI4EnjoFzZqti hAkqcdJGx9OYq1GVZb85lMXHPf59U832TUPSokDOLZAUCZbJPFpBT9YPSzW0sWr0bQAq fNUw== 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=mYnz5degboQ7Ion/nDA9QPi3KUbJtrSOrF8jl7HtGh4=; b=KKFId90EZ8oTZwzmos9N46X/ksvzapIdIksGtVZu3BdISzIMGVOOuB+IaX0omqXdVh TbnTaq8LSGpEoVTXBGVmxOlKV/BzVofeGVzlrc0QB4oSf5M0NjumytZldMjBuFr4LPbb Ay64RU0qDdI3GNals7xW07xMlpKATN5XlzQeoYuDrgO5mNiakdkwwl5oqqN/bpybFQ0A JfQKe6Bbj1rNglBg4EMZwU8yCMgjibdvQin3Bn1Lvl31ipYziLUk9B9Rys9ksbO9kX2C t3uz6E0dksDTBSKrDJB2OOgZKW9j85FjtyIVBfsYrS+WY+qkt7KWqJzJuRhgKh/Jcz8f Q9Qg== X-Gm-Message-State: ALQs6tBMXs2o7tx2YDd72tBItwfKjqsvpEZ7mCsANznAiDiQrsYOouQy dsboNOHXHOpspyyhBvLYl2qhEvkP00Y= X-Google-Smtp-Source: AIpwx48FephBBOxLs+S/oeJavNKMgCGNHxj3DSCqfdA5vkVileq+EeiEWNBHO/NofFZAL8HXfWYJJg== X-Received: by 10.80.211.3 with SMTP id g3mr33037540edh.15.1524575928296; Tue, 24 Apr 2018 06:18:48 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id h64sm9349075edc.19.2018.04.24.06.18.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:18:47 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Marek Lindner , Simon Wunderlich , Antonio Quartulli , "David S. Miller" , b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org Subject: [PATCH] batman-adv: fix batadv_interface_tx()'s return type Date: Tue, 24 Apr 2018 15:18:46 +0200 Message-Id: <20180424131847.5469-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/batman-adv/soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index edeffcb9f..e6c800b06 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -188,7 +188,7 @@ static void batadv_interface_set_rx_mode(struct net_device *dev) { } -static int batadv_interface_tx(struct sk_buff *skb, +static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { struct ethhdr *ethhdr;