From patchwork Sat Oct 28 00:09:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 831549 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="whWymj9l"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yP1N11Sx5z9t4b for ; Sat, 28 Oct 2017 11:10:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbdJ1AKC (ORCPT ); Fri, 27 Oct 2017 20:10:02 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:53729 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164AbdJ1AKB (ORCPT ); Fri, 27 Oct 2017 20:10:01 -0400 Received: by mail-pf0-f193.google.com with SMTP id t188so6003014pfd.10 for ; Fri, 27 Oct 2017 17:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cVXVtQlMnMlQpurQyokgO+EUQtsWaIWfLnLqXorvB08=; b=whWymj9lKxiCLHW7nDcTfSV+Qdnn29WQnhFAIp3YYFAgBMzm/b5xTiyaoe+dPQ1h9P 8M8c8WfGzK9wAaDICX1rcRs3lXpRfjh24YHnhW9N55A1zKY4fA7KJxUx9zfPW0kP6BtY UWXiZ4S/WhmBeDHAQ3EdjEOx2gjTYsBGoTP6n8FEte7Cj62eq/POvk5uWR0drgvPUAnW OP1vcXhRA9gBbZ55R2fD5RDx5xTxvL05qJBAwQPNEEbDIZBJHjzDRKT9IXQ7/rSais+r Gi136OqO+gQbubMyj01PtkRtDSeRPQE1nm1s++bhO+X+OH2Ej7Ju0P+6wHTMMQ4Oal1q EMOg== 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:in-reply-to :references; bh=cVXVtQlMnMlQpurQyokgO+EUQtsWaIWfLnLqXorvB08=; b=b9SvMtgDk+DzhCLPVQQSyjZJyI5EoxEnoeUb28fnKR/hD58l9iD72WsOboxaOHg88y s7ALRf92Ze6578uV0dBpy5dxE4bXxlUYbetPYSchc4s8JhGlYjYeW78HoQDS7qnY463a 1bX+XnQJOmGgJ77BOIhfMQUVsJBaPloBvMiOW8nFQqyRQwuyaqW5gI6CMpHcsKc/3f/a dgTmweMeoCjEEBfocOBZapw3ljIaRIevqxtt8ZKZ8z9PK5DoUgfLbv11Jy4dD3UBsPFZ IegkHG/QlZ0/UT3tH5d5Qx2Zn12kunaIRsX+u1JPAiEkCOJt4tJxoNLjgza4YrpZ8VZL qLCQ== X-Gm-Message-State: AMCzsaXFP12mYWCARYxn2V9EXrVZMPBO3BJQcBJsa1ZNl6i45wvAiFiB XGlJtlXHceipRh4dB+0Rav1owg== X-Google-Smtp-Source: ABhQp+Q2tY3fA32pQCGlDBghYHDpaIeMrOmn+0uRpzVlvWI80kYmLoRwlITCfGqOZXy4OYphIsZwow== X-Received: by 10.101.74.4 with SMTP id s4mr1579887pgq.259.1509149401075; Fri, 27 Oct 2017 17:10:01 -0700 (PDT) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id 2sm9068398pgb.30.2017.10.27.17.09.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Oct 2017 17:10:00 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: pablo@netfilter.org, laforge@gnumonks.org, aschultz@tpip.net, netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v7 net-next 01/13] vxlan: Move gro_cells_init to ndo_init Date: Fri, 27 Oct 2017 17:09:25 -0700 Message-Id: <20171028000937.2631-2-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171028000937.2631-1-tom@quantonium.net> References: <20171028000937.2631-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move gro_cells_init to ndo_init and properly check return value. Signed-off-by: Tom Herbert Reported-by: Eric Dumazet --- drivers/net/vxlan.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index d7c49cf1d5e9..a54dd3d2a824 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2392,10 +2392,19 @@ static void vxlan_vs_add_dev(struct vxlan_sock *vs, struct vxlan_dev *vxlan, /* Setup stats when device is created */ static int vxlan_init(struct net_device *dev) { + struct vxlan_dev *vxlan = netdev_priv(dev); + int err; + dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats); if (!dev->tstats) return -ENOMEM; + err = gro_cells_init(&vxlan->gro_cells, dev); + if (err) { + free_percpu(dev->tstats); + return err; + } + return 0; } @@ -2653,8 +2662,6 @@ static void vxlan_setup(struct net_device *dev) vxlan->dev = dev; - gro_cells_init(&vxlan->gro_cells, dev); - for (h = 0; h < FDB_HASH_SIZE; ++h) INIT_HLIST_HEAD(&vxlan->fdb_head[h]); }