From patchwork Sat May 13 18:09:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 93577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5917265vqo; Sat, 13 May 2023 11:35:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5OsL51ifgkwYq1UnkAlAXWo1PUNd7j9Lf0AhNGYl24CpEjR9wbwY4Q3W9sXqPTMNAur9Cl X-Received: by 2002:a17:902:ba88:b0:1ac:43ea:7882 with SMTP id k8-20020a170902ba8800b001ac43ea7882mr28691518pls.29.1684002925278; Sat, 13 May 2023 11:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684002925; cv=none; d=google.com; s=arc-20160816; b=d62FFjSM3PnFaYdFfW1et5qVOQqt/4VWKzt32LafRscvEFiR8vNeFrjU4h7iktwydY H16ytl8cSy1GSuq1VGAQIeGJfBXEu55hYFWWhNIv4N2a6Fo4RD0jZF2u7ai39W+ym2iE YtTrp3ugtrlmG6BlXaTSnI/qp5dJtDvattZfkRE3Ho8RGRU0r4dBYdSjkfL1fYUUxRoe 9U0hfTs2C3WtnK9i0U4GiDIDH/yKdM+56v4OdhNqR0vTV/OsSKy2l0/w0Ze9E/HG2m3w mMW4ImA6yohwE9UUYaWTEhWE3oIW2Ro+4WVoFcNp8mLnyG7IZC6uL6XG19LSTAlqeo78 rtNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=0Y1rZV1MmREzrVxUKPP6KLxWKeW+vjNzBkwfZoTYQPs=; b=gw0933PyUx3LAbaE/fd0SGrVJZDjT5oH4T/pVgSd2eW3QKnYZRgCzk3afyz7x5NhfT mUO8XbU5e4yfntjSCAtfLrhRJzYQA7KB1iCa7Fq+6i16mxH/JkTwQiZVUDU4l/8pG+rl EDd6Y7WE9S+TRpXbkvZ4e4gzWqEdj5m5PyAkZhbWyFIkrvbKAs3pEPw85a/DQNIncvPn XEqB5l9rhVyINubmIYdF04id8M0mHX46AoEvypZS6zPa7yOulHw8a+1Nw3VHWJpQpjlF KfL4wSO7ieJTLTN/gkm3axR+6leE45bo2W3qTVPvgJ0VxiS7ipLd3Iz1yWortgqbCq7r odkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=oW2BTlZv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a656944000000b0051b25fd77absi11760925pgq.887.2023.05.13.11.35.11; Sat, 13 May 2023 11:35:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=oW2BTlZv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237280AbjEMSJd (ORCPT + 99 others); Sat, 13 May 2023 14:09:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237293AbjEMSJO (ORCPT ); Sat, 13 May 2023 14:09:14 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E9CB4696 for ; Sat, 13 May 2023 11:09:07 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-965aa9d1d19so307551966b.0 for ; Sat, 13 May 2023 11:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001346; x=1686593346; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=0Y1rZV1MmREzrVxUKPP6KLxWKeW+vjNzBkwfZoTYQPs=; b=oW2BTlZv06GJHQgOMs+JHJERgBNw3DCYSrqWmlpjcRvpjzifJMBlQk+N1u8o1iDZS1 /y6ybJ1ADRb7POgVRx1BnBgla5ndAY9ItiBT0kVY3KowMHoZKBDvcfngAY0qAKH42oXy Q3BkaKo8uyMak0jGHeEIMcQP184ll3UtjpWwphGVfkiNlrr/r3Afuq9H/iY1aey7rSoF WwBHmYTnp8lPs8u+LghU+hRVoVg76ATY1zUJXXcn8XJa7o1S+k8d5IVfD7045Udt3tMI ExZkBVTnC2th0YwgR6PBPyq+RWboqCA3wJer0/GTedRf644VYrAchqPvCZFSJkvcYX2/ Xjlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001346; x=1686593346; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0Y1rZV1MmREzrVxUKPP6KLxWKeW+vjNzBkwfZoTYQPs=; b=hgWIc2CfARx/rjOBEvReVBcfc/HCd/PhpgHh/jRkOp+rZaVp2mqXF/YlgL3xcPCK68 3/QGaFpme1PDB5h46b9DXOhxaPmQ0dwf0Q36Kby4gbsHPOqpgfdhXisS5BimSRwTqXsG prVBXpCalqqdiXYxLJRU75Llrahz5zPYBXmPDktN8eVtgfT1e4HUMwc8wUVIoC88jc5s kO8oiPWPyGph3VJQciu46dQGDvUYfqwXyWEq98MIfJei9XxZipo5TBMXkg2rdmiC8buG WGCglBbGSyVmq4teN1wM1MGvbr/qeuRZXiEgKdyxKvVwC/DijnA4LOmENsHeAjjzu6gs 8lrw== X-Gm-Message-State: AC+VfDyyxwpO5hSRT2QlTQ8m2ZFhCTIviOxYn2N4zQ7EmnIpwUOGyBOA ZUmxuKrwQBUIUMevaEkZVGg= X-Received: by 2002:a17:906:217:b0:94f:66af:b1f7 with SMTP id 23-20020a170906021700b0094f66afb1f7mr22946006ejd.1.1684001345848; Sat, 13 May 2023 11:09:05 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id p15-20020a17090653cf00b0094ebc041e20sm6952776ejo.46.2023.05.13.11.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:05 -0700 (PDT) Date: Sat, 13 May 2023 20:09:03 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/9] staging: rtl8192e: Remove undefined function reset_port Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765805051397984339?= X-GMAIL-MSGID: =?utf-8?q?1765805051397984339?= Remove function reset_port as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_wx.c | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index aac71fda4541..cc4247ebea6b 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1661,8 +1661,6 @@ struct rtllib_device { int (*hard_start_xmit)(struct rtllib_txb *txb, struct net_device *dev); - int (*reset_port)(struct net_device *dev); - /* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is * not set. As some cards may have different HW queues that diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c index d6691f3c7c70..1876ff75c31c 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -420,18 +420,6 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, if (ieee->set_security) ieee->set_security(dev, &sec); - /* Do not reset port if card is in Managed mode since resetting will - * generate new IEEE 802.11 authentication which may end up in looping - * with IEEE 802.1X. If your hardware requires a reset after WEP - * configuration (for example... Prism2), implement the reset_port in - * the callbacks structures used to initialize the 802.11 stack. - */ - if (ieee->reset_on_keychange && - ieee->iw_mode != IW_MODE_INFRA && - ieee->reset_port && ieee->reset_port(dev)) { - netdev_dbg(dev, "%s: reset_port failed\n", dev->name); - return -EINVAL; - } return 0; } EXPORT_SYMBOL(rtllib_wx_set_encode); @@ -625,13 +613,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, done: if (ieee->set_security) ieee->set_security(ieee->dev, &sec); - - if (ieee->reset_on_keychange && - ieee->iw_mode != IW_MODE_INFRA && - ieee->reset_port && ieee->reset_port(dev)) { - netdev_dbg(ieee->dev, "Port reset failed\n"); - return -EINVAL; - } return ret; } EXPORT_SYMBOL(rtllib_wx_set_encode_ext);