From patchwork Fri Dec 8 18:19:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 175998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5636259vqy; Fri, 8 Dec 2023 10:19:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFR3bR3OvKNpsCsdQtmCrORZJil+joEKsSsFBU+6+83jZIKxt+PlscrHd1oJRxXMkJWcVZU X-Received: by 2002:a05:6a20:2584:b0:18a:d791:6629 with SMTP id k4-20020a056a20258400b0018ad7916629mr617145pzd.11.1702059599292; Fri, 08 Dec 2023 10:19:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702059599; cv=none; d=google.com; s=arc-20160816; b=qQZmOE490uPnfG8X5uXdPiMDCl0IAj6foM9SXgonS0GdcLRtWe0hBbM3DdfwANFUyG DJtGWYo59Qjr6WH7qtjgDs+EiEw93heGf9a7ysuwbhQqY+WrI+NaP3RkvTLZJvB74nXg 3GHLx7QSUhjBY2r15JpgJtMXtfqn/raj0TS439OJdw/Ujs8gHQq5/GQIjdcW/S66s2S8 Fits+laIG/cuCXQPVEYnpNQ0UwE5JeS1C3AcZBYvvAkCsHqNQWR8+F62/wSRApsk5mFY Wcerfl6n2FVrwisVq68vZbP6cBr++FEIZ3pitoDgzhjt5bpPKH5yYChrfYp4W6iaJG7W 7Gww== 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=kTX3lMeAIKadkUoJwz/Rosz/NiJGwf6YHqZeimpRp6A=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=p/8Q7DpiFUnYeKiUsO/Ht1QxEpGzfQVAhonTQlQsNI+LqnAITUMjX8PgnhXOd93nYG OdYJFRP6FX2vJNtFqXH0MdIIe8jfk3fid/jOEQkZ6PjD+EYwgB+/lK7Xjr7//htDyku6 nTw+kSTcgWWcR2+uSptKFXhXGpWAICTIHKHNY7iQIa/einc2JTcEKR7EauGeQ49snaoh VhKhTckoFSIYYZM9kyfnIoqoEORFlzTRLTG6iZPDCxbXCm4HCthjnRONuBkiUJQr2WTA e0MqDdOTf12IO7zceflgKINwNzuZDhcH1tyHqyru46dD1f7kOl2YOEGnzZhwtTacFfjs LqAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mDLbP8vt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id 199-20020a6301d0000000b0057745d87b53si1822390pgb.686.2023.12.08.10.19.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:19:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mDLbP8vt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id C645B819D712; Fri, 8 Dec 2023 10:19:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574604AbjLHSTc (ORCPT + 99 others); Fri, 8 Dec 2023 13:19:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574592AbjLHSTa (ORCPT ); Fri, 8 Dec 2023 13:19:30 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83F38172A for ; Fri, 8 Dec 2023 10:19:36 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a1d48f0223dso65241266b.0 for ; Fri, 08 Dec 2023 10:19:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702059575; x=1702664375; darn=vger.kernel.org; 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=kTX3lMeAIKadkUoJwz/Rosz/NiJGwf6YHqZeimpRp6A=; b=mDLbP8vtyMy84mVO3GrO5VmCe7tdhUbP9faumlnvcR+S03q9haSXx6nDgvqPsRNgX4 83xv44mZuO7dUnxj9F61UDg7YT8iUCAzVNSA6VynNWScvZFGYXyhbR/Iax12UNX5xw0Q HaopogiWm07f/wdC9/Y+GwDahA0+b6OaZ5D7g0vmr9E268v8i6zvTaCdJ2cNhkPOyfl8 Df/ZlfKkyrqShCLofLvXV+G1mwlsxniHhoKA18wKQoqs733QbpqPsej89EYMTbL0xaxP A5NMTmXFnrTBv8nh3lrPuzQtHPe3I8YFUUyO4gYSzQS3NzWXbZKUPdyaWWcb3csfne4P Kk5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702059575; x=1702664375; 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=kTX3lMeAIKadkUoJwz/Rosz/NiJGwf6YHqZeimpRp6A=; b=gF+X6TClVVcd3MhgrbNMWZ6U0lmHEWaDnF2G+sfnAfcHPrdROX2nhT10HRtE2y9F6y 5YKRuK8n+I6B4DgDwIV6rdFmUj0NhzQk4NPE9HaOAEmi1PX2nQrJDqyLXMz1V0B6ycWQ BtnnuB81Eb5hGntXHcGb4R4p2D9KcGprxD8RHo3kc+ifMtEL67qxxnV0AQcuH0zx/epa ikZhki/BRUhTObAZWGkNCjyTQJW8m823IoZ+zMgc3JEg/NIxIzivL4bIGrjH9FPLAmat O7Oqw+jLrKheXv4K9wsudpjohpeoxTax8YGrvIGbDXuuwjrnsrtgs4jWNI0JSBxfdVRp DfmQ== X-Gm-Message-State: AOJu0YxjcG/s9RREBls2SnBubVfko5ExRji4TZNS8GyyUlyf4/XV7yOQ DeIhcA6t12cMMiAz0vQwTXA= X-Received: by 2002:a17:907:d30a:b0:a1c:dce4:1daf with SMTP id vg10-20020a170907d30a00b00a1cdce41dafmr445458ejc.2.1702059574759; Fri, 08 Dec 2023 10:19:34 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id rd12-20020a170907a28c00b00a11b2677acbsm1266784ejc.163.2023.12.08.10.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:19:34 -0800 (PST) Date: Fri, 8 Dec 2023 19:19:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] staging: rtl8192e: Remove function rtllib_update_active_chan_map() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 08 Dec 2023 10:19:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784738846126434370 X-GMAIL-MSGID: 1784738846126434370 Remove function rtllib_update_active_chan_map() as "active_channel_map" and "channel_map" have the same content. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index d20970652432..fdb0e76d20b0 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -394,12 +394,6 @@ static void rtllib_send_probe_requests(struct rtllib_device *ieee) } } -static void rtllib_update_active_chan_map(struct rtllib_device *ieee) -{ - memcpy(ieee->active_channel_map, GET_DOT11D_INFO(ieee)->channel_map, - MAX_CHANNEL_NUMBER + 1); -} - /* this performs syncro scan blocking the caller until all channels * in the allowed channel map has been checked. */ @@ -408,8 +402,6 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee) union iwreq_data wrqu; short ch = 0; - rtllib_update_active_chan_map(ieee); - ieee->be_scan_inprogress = true; mutex_lock(&ieee->scan_mutex); @@ -475,8 +467,6 @@ static void rtllib_softmac_scan_wq(void *data) struct rtllib_device, softmac_scan_wq); u8 last_channel = ieee->current_network.channel; - rtllib_update_active_chan_map(ieee); - if (!ieee->ieee_up) return; if (rtllib_act_scanning(ieee, true)) @@ -2042,8 +2032,6 @@ void rtllib_start_protocol(struct rtllib_device *ieee) short ch = 0; int i = 0; - rtllib_update_active_chan_map(ieee); - if (ieee->proto_started) return; From patchwork Fri Dec 8 18:19:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 175999 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5636330vqy; Fri, 8 Dec 2023 10:20:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEME/oN5Fu9mKw6Yy54seRzbk6jY+pzQfdTyTKG6UA592ItbLnzB0mrNjGgy90YiV/9kRIA X-Received: by 2002:a17:90a:73c6:b0:286:74c7:4250 with SMTP id n6-20020a17090a73c600b0028674c74250mr472698pjk.38.1702059607197; Fri, 08 Dec 2023 10:20:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702059607; cv=none; d=google.com; s=arc-20160816; b=c4pFCye+kY4e6FJ6E9L2XWRbHHPYXg5j2NnJzrPKdz8VlKidaBXd3RUdRl40+p332R D0zB3B2qG7LDb6hcG/wdZAtFk7ZT948IYpmsrtUqlgy44UuwfjDhxnPzRa5pkoGKRFA5 4D441TYa/LTFntPJGvQQUIu1UlQddf6JSUHL4vkzCeuFXB9f6eLAjDPr290MJHMjLbQ7 qhhR0qcKwEi5LqvZY/dH7DNznJFEaMZN7El8xzbQH4ashGo3kl8ukHxWW+mLf7mUM5yb NLK6jT9b+y0QzVli5eFxf/Khyp3Bydftw/3PGgDE+eo7NglnjN0SRJdDgJ4jEXW2+5iS aJSw== 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=3+GiMKSFFjg4ZMw0A4N/m/YEPbPCxTc/5rQWQIRaPIU=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=sYRNUo0Uo/uq7y8oy5j9luqpPvOntbHgbsBPZNMs/7b8fcGsnTYdE+nOKboOHml+h7 4RYBVTIBJZEU5xwmdLhu7moaRI6TrHDtyWNVGTNXfav32yPfGia8D8DV2NN3kFdZkx5X dCPk9Zd7a3aStgLJmaL643PtSwZSLH9lRhgpGuHAvkovtgxT8dy2ydVBJFZ+76wn4mQk E/g4+ihkNk0dG2i65/Fn1q2+xmusvqIRL5XFlXxv5FKajtRPKKE2wPjbHVh5D9VObvr2 BQ/YHawdhuk2FVz6jEW7iZP2X77x/tdvbj46e3fizvKYiXEppm/uMl3/Kw+SCqoxy6mm G9Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aGMhPjcy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id o11-20020a17090ab88b00b002868f5b2c7csi1421754pjr.33.2023.12.08.10.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:20:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aGMhPjcy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 1854582663F2; Fri, 8 Dec 2023 10:19:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574566AbjLHSTu (ORCPT + 99 others); Fri, 8 Dec 2023 13:19:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574560AbjLHSTs (ORCPT ); Fri, 8 Dec 2023 13:19:48 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A499F10DF for ; Fri, 8 Dec 2023 10:19:54 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a1d48f0223dso65253266b.0 for ; Fri, 08 Dec 2023 10:19:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702059593; x=1702664393; darn=vger.kernel.org; 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=3+GiMKSFFjg4ZMw0A4N/m/YEPbPCxTc/5rQWQIRaPIU=; b=aGMhPjcyOMo0IMdWGMFMCLDTB+60RmW2B8FKNhhD9z2m83nNKwTzzzLG4e1gpO8v+r QWD94wbylf1EnhzlikoxbpBBY8cAnw3K3SQwfMyQVdsvLQkH8XXf6CdfuErAQcDEIj2v A6Hubd7gC8ih3977XG+KOJEnlDbXzufV9+b3Gbwkbi30NVSW5JTu/S2xugAvqp9I7cHe 4r4Zx06XIkU35bHfvkPvc17DXr3JYVGO4uE/DDPVzw6b4mv/+QrATvTXVnrT2KiZvMLZ VKhivfVTiZBQDYEw1gN1SAYU7EZeiEcMBxWuxn1r668t1srWDw+eGmkg83CqVB/mFof5 0TUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702059593; x=1702664393; 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=3+GiMKSFFjg4ZMw0A4N/m/YEPbPCxTc/5rQWQIRaPIU=; b=b0NZGBYPaiul9VZSRFsKHytBAGITuQ5XYxvhVvc2tTVWl1wlQ0f+CHLcWbVdwgvya8 wTASRxPUCrDwZl1raJe53IXchdwoxpKabwwpvH2VI2of1CbzKpS69MXipzLQPL1THTnw /2VcndJeEhXKlUsNpp8KXTNTdUHU3UURbbUG63A1UEPxWtULrtxBWbKNgGRbXyhXQaaD fL5BNbZp9Qfdd5PlDmio96rXi8S9IeywaSp+rurYNeJbDg8pO289dwRC9lsegGqWTRYp dDdIs9o38Z6Qup8Sb5aooduCDPGpdB85IzuZ8kJ1wt7XrFUIzJ3JCpjPgmoi5Sa8oY5D YO8g== X-Gm-Message-State: AOJu0YxM45UcalBg5ONsP63LmoG1t5g24JuOmgaLEQ5b10POBbQBxNrI Yc/YThk14RaLLgZt3mu3nSY= X-Received: by 2002:a17:907:d384:b0:a1b:1daf:8270 with SMTP id vh4-20020a170907d38400b00a1b1daf8270mr485532ejc.5.1702059593003; Fri, 08 Dec 2023 10:19:53 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id tf13-20020a1709078d8d00b00a1b8829597fsm1260423ejc.114.2023.12.08.10.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:19:52 -0800 (PST) Date: Fri, 8 Dec 2023 19:19:51 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] staging: rtl8192e: Remove variable dot11d_info Message-ID: <2438971feb0c02c5c72776f57201a4011f249190.1701989555.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 08 Dec 2023 10:20:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784738854642107973 X-GMAIL-MSGID: 1784738854642107973 Remove variable dot11d_info as it is unused. Remove unused struct channel_list and empty struct rt_dot11d_info. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 5 ----- drivers/staging/rtl8192e/dot11d.h | 6 ------ drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 6 ------ 4 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c index c44ff26e8d61..8d89f962b3bf 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -7,11 +7,6 @@ ******************************************************************************/ #include "dot11d.h" -struct channel_list { - u8 channel[32]; - u8 len; -}; - void dot11d_channel_map(struct rtllib_device *ieee) { diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/dot11d.h index d047283f2ceb..98aa28d0cf72 100644 --- a/drivers/staging/rtl8192e/dot11d.h +++ b/drivers/staging/rtl8192e/dot11d.h @@ -18,12 +18,6 @@ * 2 - valid (passive scan) */ -struct rt_dot11d_info { -}; - -#define GET_DOT11D_INFO(__ieee_dev) \ - ((struct rt_dot11d_info *)((__ieee_dev)->dot11d_info)) - void dot11d_channel_map(struct rtllib_device *ieee); #endif diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index ec720f776639..51dcea57a329 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1320,7 +1320,6 @@ struct rtllib_device { u16 scan_watch_dog; /* map of allowed channels. 0 is dummy */ - void *dot11d_info; u8 active_channel_map[MAX_CHANNEL_NUMBER+1]; int rate; /* current rate */ diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index fdb0e76d20b0..3c92eb401e8c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2077,9 +2077,6 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->link_state = MAC80211_NOLINK; for (i = 0; i < 5; i++) ieee->seq_ctrl[i] = 0; - ieee->dot11d_info = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC); - if (!ieee->dot11d_info) - return -ENOMEM; ieee->link_detect_info.SlotIndex = 0; ieee->link_detect_info.SlotNum = 2; @@ -2153,9 +2150,6 @@ void rtllib_softmac_free(struct rtllib_device *ieee) cancel_work_sync(&ieee->ips_leave_wq); cancel_work_sync(&ieee->wx_sync_scan_wq); cancel_work_sync(&ieee->ps_task); - - kfree(ieee->dot11d_info); - ieee->dot11d_info = NULL; } static inline struct sk_buff * From patchwork Fri Dec 8 18:19:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5636402vqy; Fri, 8 Dec 2023 10:20:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IGpsWYZvXoVSsnIiPhSAU4x1E+7ILKIzbifyA4cayNgYGifYaaThRkP2jYz2+r4R1WC1/CV X-Received: by 2002:a17:902:b198:b0:1cf:b4ca:4e79 with SMTP id s24-20020a170902b19800b001cfb4ca4e79mr383460plr.17.1702059615187; Fri, 08 Dec 2023 10:20:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702059615; cv=none; d=google.com; s=arc-20160816; b=SsNG/qXpXKhOcRYyhCQUinOTR9anG7P5zniO9p5uJjV6K3FgjlHwUzhjJ1rMX6fxbE vegihzgLiVQD7zOvJbEJaOPEGvxeDylb65qD3Jjq5nPbhD32V24OZYhczfEmUcKoA1Q3 IWMBru7oTWBu+uYGGNIeH68AWRIyhuSD97Zvkgx+dIYDk/7DY71pgWXYyaO+jgB6DXZS SPOB00/IikBLpWMinsWnXcYRLS/NRdwLUQuRGetRz9LlljyKW8fBbUIgtbFwCfk1tOAC Nfl2R0hWGlOyDSEuqpeW0DHBHQuz/JlYYyDlH36lAuUY+HQhPTsrHk8p/pgUrF3+6jG6 YwYg== 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=NL738sRXL2selidGyxVJuSE1dSJZ2wGMlE7qfmgnwJM=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=PKMSVq+n+qTuqgaNbxEOvAPvcHns+qawmLaJA82K3pLOzEn1t8y7e8loliipQ7EzQz 9H3SYyKqL4aFCvtOfGmA1cYDuCwYvR4/+FJ83MvbXRpnV5CgusKfr4tgFdkkQ1Cy9f79 J8lM2BMSoMNKIZWXXngDaOYBmzIMSNhOZseo7p7BcpSfixpqonHXlyPMfALdCb6vgfCi uzkMEhLpUDycwr6lkiR0c6xaBAzJsnz0/H+tWk9v+JgHHg9E4ub8LVLFhZx1GSNq64OJ aIuE2iBGkxbsPfDSIgpkxJB91B9V/5OSVBmo2od3daIDQ3+e+Ro+ooZJUhBrsxcKV9du Vpgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bgeb2RTn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id a18-20020a170902ecd200b001cffbe81706si1986782plh.354.2023.12.08.10.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:20:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bgeb2RTn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 23A2983B1EB1; Fri, 8 Dec 2023 10:20:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574639AbjLHSUA (ORCPT + 99 others); Fri, 8 Dec 2023 13:20:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574643AbjLHST5 (ORCPT ); Fri, 8 Dec 2023 13:19:57 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C49F10EB for ; Fri, 8 Dec 2023 10:20:01 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-54ce02c1ba2so599982a12.0 for ; Fri, 08 Dec 2023 10:20:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702059599; x=1702664399; darn=vger.kernel.org; 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=NL738sRXL2selidGyxVJuSE1dSJZ2wGMlE7qfmgnwJM=; b=bgeb2RTnHWBM9BYvVKIFTPWtYVYaLWsypskloEWIQNzkbWkGmTqIzKlORUGoik3ZoG c4/iPsncGwjJHG3uMyLZUvQZrz/7A7ruq2oQOVeDnASkq7rDEWAtVgLx9E4e64ECeklT UOiVanPaIncd8V5HADLQeZLGxVZcjLCS0Fhu1KEWJ2DNqy2/m3LyWroHeiaNsqK9qCke ihUYARIozR6lBNTrR5CpcBsaVaoi4axqIVpPwdasTDFSwNvW4yKOGqPy9xyoNFB1NBSQ pGseH/FQE1x9rqClIenjuaASeEaS6tbTpVjoK4ivRNblqZP2W9aRBbQqnynplZbEInOX 4s9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702059599; x=1702664399; 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=NL738sRXL2selidGyxVJuSE1dSJZ2wGMlE7qfmgnwJM=; b=JUJ9ZPwtHJ9V9I4DGbvxD+C0F5o7ErYvY9AcTxwXsAfmRLlHuV28O4yh1kWXX5eVXw 7u/30gX7HkCAy2TEVERu0HMJxPOSEeFNiPW24l57/Eqt7H8FljWBVar9bjYt0GTBoB6+ xWdELo2BlMW3R+2KWpWw3I0OTyTTsfBbuy83ga9aP6L+Fa+qmqdmzOMxRmnfmRu3YVaM 2/dVnQmnGpdQsP7l6Q6LOowHPNCo/cKgDCfWw884UItPq/X3fSAAL9+7lbbg/kBlIb/b 0eoEEqzqZVrCRrl+12UWTkF3/QNo+IUSduR607jAdTolpM7cqmdk0+BM2WK6wqjRXUG8 obrw== X-Gm-Message-State: AOJu0YxjYBD6UP/1ZyHYW8WCeQkXMydqEVPXxOCaAcwCsxWeS0Mb//YW CbYJ9y1KcrU6V3bVcqsDv1Vk0eY8/Cg= X-Received: by 2002:a17:907:c207:b0:a18:96e3:ae2a with SMTP id ti7-20020a170907c20700b00a1896e3ae2amr446873ejc.5.1702059599455; Fri, 08 Dec 2023 10:19:59 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id vo16-20020a170907a81000b00a1d32dfacb9sm1276308ejc.38.2023.12.08.10.19.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:19:59 -0800 (PST) Date: Fri, 8 Dec 2023 19:19:57 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] staging: rtl8192e: Remove function dot11d_channel_map() Message-ID: <877c0efcf56977cbf0943b34beda4ff2ca514714.1701989555.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 08 Dec 2023 10:20:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784738862930894596 X-GMAIL-MSGID: 1784738862930894596 Remove function dot11d_channel_map() as it is empty. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 6 ------ drivers/staging/rtl8192e/dot11d.h | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - 3 files changed, 9 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c index 8d89f962b3bf..ec71bae05c1f 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -6,9 +6,3 @@ * wlanfae ******************************************************************************/ #include "dot11d.h" - -void dot11d_channel_map(struct rtllib_device *ieee) -{ - -} -EXPORT_SYMBOL(dot11d_channel_map); diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/dot11d.h index 98aa28d0cf72..eeefbfa96938 100644 --- a/drivers/staging/rtl8192e/dot11d.h +++ b/drivers/staging/rtl8192e/dot11d.h @@ -18,6 +18,4 @@ * 2 - valid (passive scan) */ -void dot11d_channel_map(struct rtllib_device *ieee); - #endif diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 1f45b6b00d1b..72e89ccfb184 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -761,7 +761,6 @@ static short _rtl92e_get_channel_map(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); - dot11d_channel_map(priv->rtllib); for (i = 1; i <= 11; i++) (priv->rtllib->active_channel_map)[i] = 1; (priv->rtllib->active_channel_map)[12] = 2; From patchwork Fri Dec 8 18:20:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5636523vqy; Fri, 8 Dec 2023 10:20:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IF3dv2oJRwAQRMqxgdntRhrSSmyLoPE0kV9nMxMyphCg1IqmzPhQ9HOmQcJn4ZX4j4cxDir X-Received: by 2002:a05:6a20:2c81:b0:190:3f2:a589 with SMTP id g1-20020a056a202c8100b0019003f2a589mr1429225pzj.55.1702059625120; Fri, 08 Dec 2023 10:20:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702059625; cv=none; d=google.com; s=arc-20160816; b=Gseeo2ASrt+U5qJFB7IQp0NX4gw5UjYD0ciqvqKtNgO4llAtqIAl4aAd9fHSYFa+zM 8gAKA4fgWtcdvQlNIVQ6Y+p+QXL45LZMay0wxgkIBAjOw/0jXAm0gXkfZC4p3txU69hU nY0kAWxBSUXCQ8oR9Rg8CEjYVtWMm1OBD4DO+Zbyrf98hiRkaK7iHrwxav5qAR8IiR09 H1nS++jMehJKikwrDaWfDJqOHSx5qK8DpCi7wWxv4XdG3Cekn3EVJO7mp73CDxfjxHBd 0h9rMhU7p9MDQv7IRa4c49H37WsVHA6e9J6TQgYzVYn0xJPkc7KxIKwp94UT4Mxxn7+7 62JQ== 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=HoMxh9Soo4aEQSXS16TywESmqL58qNmWTbQ/HnkwzzM=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=Vl6uqfaQ8sWH/d0XS0Ikk4HVnR3z2/mO7Ydq/nZskNV2uQduHXM8qoome+3gmaOCnr ZjlAT3WcgMh9xBcRtivLdr1M9N3VrubIATyZDhGKN4ZsR0bI9aZEHF+cVDD7PclSqquO cfiW9rG3jkT9ZsHrQibihkAoB3a6ZYhex7BxBrbDmVEJBcLa4YcRuGE9aqWvKA0kHzPs 1UapJaSmPpWw98SL7A8/CUKYtzvueRNXIcgPlJPSsA0NqqAB5hK1h9hIaWuk4WxtQb7e j3dYjLkMt9tr+8woURuEVNcaUonx5VgYj7RsEYnplIyX1F7l0eTJMsukN5Vcf9kB2LHv qA1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Fugx/t7O"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id bq13-20020a056a02044d00b005c200b11ba3si1997676pgb.888.2023.12.08.10.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:20:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="Fugx/t7O"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 3FD6B831A485; Fri, 8 Dec 2023 10:20:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574643AbjLHSUJ (ORCPT + 99 others); Fri, 8 Dec 2023 13:20:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574646AbjLHSUB (ORCPT ); Fri, 8 Dec 2023 13:20:01 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 828B310EB for ; Fri, 8 Dec 2023 10:20:07 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5451faa3aa7so545885a12.0 for ; Fri, 08 Dec 2023 10:20:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702059606; x=1702664406; darn=vger.kernel.org; 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=HoMxh9Soo4aEQSXS16TywESmqL58qNmWTbQ/HnkwzzM=; b=Fugx/t7Ooo+1Et2bbw1VQpIqu7Up4MglEoMOwhDzbDUB3gyPNqV9U192uSB+/uNvQe xgUNBblZ0Kcybh9lL1FZPIgByeOKe/m7vjrLSb75xCnyhd9LOryi9839aDnZe9MtorlZ VsZUtGFftDxexcD1I2o3ORagEy8CvNm4eqj7dW8RkLQkBVePCFxluraIpx8dDIT1e17W CQi2i2z0FVWAmoAZv5cYyDXQxnyZzltH+GwvGGT8Im+oJe8PzLmDQA8gWxQYT9awaqm4 As4+zZw2dM7yT3fDWA+iokrneFvJ8buOYv1aERnWciMWFM4uk9LMuVQy+U/oQP2W9R/t aQvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702059606; x=1702664406; 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=HoMxh9Soo4aEQSXS16TywESmqL58qNmWTbQ/HnkwzzM=; b=XiH06RKfIVI/edNq/ZkWdWVW7hRRZuc3fP5uLGtSXLvZTHy3wRlPTh6tsVGjqM2Z5r AOnoKabhZmJHI6eGsUEhorXK7nH8TkepqEcHUdNj5LbyAKb+1K5L0/fG5bm4Dik7ehSS I4tzUj9Jx8zvaY1t7Z2LXDPbsBybja9Civ61DFAJlwsCKE6ZTHZU7hZcV8nXJCpZ+Syd xzuI91pVNXvtxgRM5b8KDMxK5Ci2zals3bEVLHuxmgJAqxo3SUHzY9DZezGRB/w3b66E oWffd5VHJZm0IkE2H71lRudZ546ZBb3brAephGVA9JLt8/4SsBJwTRtpXEsV2GdWppHJ amUQ== X-Gm-Message-State: AOJu0YwJXhd94ceJtju3wr3bncnjMKkRP3bNOUaY9KO5FEUX+0Zjo4An n1WT9esXB1X4V1uMvi1eDaA= X-Received: by 2002:a50:cc8e:0:b0:54c:fed1:81cc with SMTP id q14-20020a50cc8e000000b0054cfed181ccmr666882edi.1.1702059605919; Fri, 08 Dec 2023 10:20:05 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id di5-20020a056402318500b0054cea9f91e9sm988808edb.20.2023.12.08.10.20.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:20:05 -0800 (PST) Date: Fri, 8 Dec 2023 19:20:04 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] staging: rtl8192e: Remove files dot11d.c and dot11d.h Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 08 Dec 2023 10:20:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784738873332122336 X-GMAIL-MSGID: 1784738873332122336 Remove files dot11d.c and dot11d.h as they are empty. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/Makefile | 1 - drivers/staging/rtl8192e/dot11d.c | 8 -------- drivers/staging/rtl8192e/dot11d.h | 21 -------------------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 -- drivers/staging/rtl8192e/rtllib_rx.c | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 1 - drivers/staging/rtl8192e/rtllib_softmac_wx.c | 1 - 7 files changed, 35 deletions(-) delete mode 100644 drivers/staging/rtl8192e/dot11d.c delete mode 100644 drivers/staging/rtl8192e/dot11d.h diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile index 6af519938868..a1492215dab1 100644 --- a/drivers/staging/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 rtllib-objs := \ - dot11d.o \ rtllib_module.o \ rtllib_rx.o \ rtllib_tx.o \ diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c deleted file mode 100644 index ec71bae05c1f..000000000000 --- a/drivers/staging/rtl8192e/dot11d.c +++ /dev/null @@ -1,8 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/****************************************************************************** - * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved. - * - * Contact Information: - * wlanfae - ******************************************************************************/ -#include "dot11d.h" diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/dot11d.h deleted file mode 100644 index eeefbfa96938..000000000000 --- a/drivers/staging/rtl8192e/dot11d.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved. - * - * Contact Information: - * wlanfae - ******************************************************************************/ -#ifndef __INC_DOT11D_H -#define __INC_DOT11D_H - -#include "rtllib.h" - -/** - * struct rt_dot11d_info - * @channel_map: holds channel values - * 0 - invalid, - * 1 - valid (active scan), - * 2 - valid (passive scan) - */ - -#endif diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 546c8a33dae8..1d6d31292f41 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -34,8 +34,6 @@ #include "../rtllib.h" -#include "../dot11d.h" - #include "r8192E_firmware.h" #include "r8192E_hw.h" diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index d9517dbc5593..62d02576b441 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -34,7 +34,6 @@ #include #include "rtllib.h" -#include "dot11d.h" static void rtllib_rx_mgt(struct rtllib_device *ieee, struct sk_buff *skb, struct rtllib_rx_stats *stats); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 3c92eb401e8c..5c89744b2bbe 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -18,7 +18,6 @@ #include #include #include -#include "dot11d.h" static void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index b48c89d2e7bf..5d165d0b134d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -14,7 +14,6 @@ #include #include "rtllib.h" -#include "dot11d.h" int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a, union iwreq_data *wrqu, char *b)