From patchwork Fri Sep 28 21:51:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 976475 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=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="FcSnjDKJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42MQPW2kZyz9s7T for ; Sat, 29 Sep 2018 07:51:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726645AbeI2ERi (ORCPT ); Sat, 29 Sep 2018 00:17:38 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34940 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726398AbeI2ERi (ORCPT ); Sat, 29 Sep 2018 00:17:38 -0400 Received: by mail-pf1-f193.google.com with SMTP id p12-v6so5175072pfh.2 for ; Fri, 28 Sep 2018 14:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xx9FR5EKB0B/XkUrRIUt+v6eNtMCR4Xsx0sn7MX2/Eg=; b=FcSnjDKJs2rzUSRGKS4EyFKcn7rwrPCi7Cuu2OwHdOpQynQtw7Y8B4QCue8ZkhipcV DhiEmRMioLhNtGQZn4WJtDbhbFmkKNmyva5Z9Kb+xmcKefLAhTV6oJNUioMDYoHJWPyN EKePgGG7Vd2iCkNDagtnnC6iMDLq9GWYsoFhNikyvPsHFrnTpG3PT1kgO4I2AhDhdbOe DboeAGHircJsnhab6wI25TLeq3XOGyuBZ4MHcoXQ795Yzt1SbM0buG4+sFu5iZ2z12lm KbSHwW0gNID3DNBApe+WFOL/B70umy3/XkBvk9Tpa2JAw+HpxS1gW0N2LkTMvxlzzFZS 0WGA== 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:mime-version:content-transfer-encoding; bh=xx9FR5EKB0B/XkUrRIUt+v6eNtMCR4Xsx0sn7MX2/Eg=; b=HIndKtdlSMbj/NbvEkURbaRut21u/SG1qLsO8VeX30yJ3TvTUR/oP+qDe9Kmyqw6aR fW0F9EvY8oDhpwFXmlE02vYd1Ff7yZI5cU0bL1w3aTXt9E+0FC+2yEiE0D4lDN6QgYz6 uwvtRCHZJff6Sk8xlfFWArQ7+S9TceoUB3cicca6I8fqYBS3gHUIMCaPWZ1RbiMJzmsM RsD/4yzV1/n5/caxKrB+rlQGfxx2L2pR/UrzhkOzX16MI3TZtdkyc9Zh+DIMEygv8/Ma zDgvoiQT2tNiubYfXZEQ9TcLhKgEUC9HHsmjjJbdksTnJf6had6d8JThq27ssFNtTyi5 ADJA== X-Gm-Message-State: ABuFfoiW+In+VQJxTSS2JccrMBpX89CDWyQxoAGlAFKmF527J0lgJtvp vPbI+Z7TuFSHBa05led+0MuiYDLFwgA= X-Google-Smtp-Source: ACcGV603TJxESw8UA2nPFJP2lJIM+G7JI7rRr6BCJ4exi4SOqMH63/RkzvBMitlPIrqGYxljrMVanw== X-Received: by 2002:a63:df04:: with SMTP id u4-v6mr464122pgg.434.1538171516618; Fri, 28 Sep 2018 14:51:56 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:f5a:7eca:440a:3ead]) by smtp.gmail.com with ESMTPSA id d19-v6sm10090661pgi.50.2018.09.28.14.51.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Sep 2018 14:51:55 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH net 1/3] tun: remove unused parameters Date: Fri, 28 Sep 2018 14:51:47 -0700 Message-Id: <20180928215149.22092-2-edumazet@google.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: <20180928215149.22092-1-edumazet@google.com> References: <20180928215149.22092-1-edumazet@google.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tun_napi_disable() and tun_napi_del() do not need a pointer to the tun_struct Signed-off-by: Eric Dumazet --- drivers/net/tun.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index e2648b5a3861e51dc6c40d19e1198a5f3f7ca7af..71d10fb59849bff091ee64b6f7e9cc8ae2e0cf6f 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -324,13 +324,13 @@ static void tun_napi_init(struct tun_struct *tun, struct tun_file *tfile, } } -static void tun_napi_disable(struct tun_struct *tun, struct tun_file *tfile) +static void tun_napi_disable(struct tun_file *tfile) { if (tfile->napi_enabled) napi_disable(&tfile->napi); } -static void tun_napi_del(struct tun_struct *tun, struct tun_file *tfile) +static void tun_napi_del(struct tun_file *tfile) { if (tfile->napi_enabled) netif_napi_del(&tfile->napi); @@ -690,8 +690,8 @@ static void __tun_detach(struct tun_file *tfile, bool clean) tun = rtnl_dereference(tfile->tun); if (tun && clean) { - tun_napi_disable(tun, tfile); - tun_napi_del(tun, tfile); + tun_napi_disable(tfile); + tun_napi_del(tfile); } if (tun && !tfile->detached) { @@ -758,7 +758,7 @@ static void tun_detach_all(struct net_device *dev) for (i = 0; i < n; i++) { tfile = rtnl_dereference(tun->tfiles[i]); BUG_ON(!tfile); - tun_napi_disable(tun, tfile); + tun_napi_disable(tfile); tfile->socket.sk->sk_shutdown = RCV_SHUTDOWN; tfile->socket.sk->sk_data_ready(tfile->socket.sk); RCU_INIT_POINTER(tfile->tun, NULL); @@ -774,7 +774,7 @@ static void tun_detach_all(struct net_device *dev) synchronize_net(); for (i = 0; i < n; i++) { tfile = rtnl_dereference(tun->tfiles[i]); - tun_napi_del(tun, tfile); + tun_napi_del(tfile); /* Drop read queue */ tun_queue_purge(tfile); xdp_rxq_info_unreg(&tfile->xdp_rxq);