From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 557963FC9 for ; Wed, 22 Sep 2021 20:05:57 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id q11so10346760wrr.9 for ; Wed, 22 Sep 2021 13:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UEYKYQ5J9H6qMmee2VNKEvAyB/3XJjxnpzB4yMio1yg=; b=k4ZQ6heS+dr+E3tmWYKdhMFXef/P8mdd59c7stIPxv+AmyIJTOe/q2/OTI5c5yikcc tE0yXLb8sEQ0OrXulX9/FXmhGXIW0uJm/cwykVsg2WJ8Q49cV1EPfVFXyMRW+SdgGILn +MqMC956Qe5a4xhB5CVvT39+8M/aEu/3uekg9a8/MXzme7Mvlivbusap2bvOFxahykjf wTA2H+8ky6UAk0z1BWL7qeFhGjA74DcgRLtK9sscKEebZqEqG7FFaDqjb+HlT0DGTgDf zo8ljAk635ZSuEuc/e4ePlm35GGlCR8rs8vIYZZtMgeM4Tx/o0XRyeA/lxki1clXgtaq o/hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UEYKYQ5J9H6qMmee2VNKEvAyB/3XJjxnpzB4yMio1yg=; b=2sGqEhOGzb537MOMf1V9AHcM68DRQNvCux5AAo8dBsYUrzQ8cfyIYo5vP3ZsW3a6EH o7bBMIBfeeNEPzEH4ZLparmfysM5WxRZXXUfNBU8SJ1LVD/4Ea/VAExQDhglqBEIhOqO eeL6JS9ABQKh4WrhapQcfW9gkeQ3PQi/D93xdy1yTlrQMvILmb//ecCO5ySFj+7dEiLv upLYAV+CS7J4NyuriH8X5LY6utB97Vsega5PCCW8tB2hRcuoBdSg29d5Rnqojrbuq/9q LTPncsC9Z8JD7U69a4wcZd2ykhMrFMOUs6VQ0h9eGei4HOnP3ZUge9NTxS3DVsg88GUC wQ8Q== X-Gm-Message-State: AOAM530sE7rsbUO3Nq/nmuKMKsaFuHVEq8xRW7lcfcRWfDJE/QszBeKc 30NcshpNIMDizeDwO2Qa2vxe0p1Bg/setQ== X-Google-Smtp-Source: ABdhPJzPlninuCiJAb0mSSKwhdWv+D5bEApZfgQeWvIMZfsPP4v6o9z7qp+MqNQsxaejD8pDMj8zlA== X-Received: by 2002:a5d:5351:: with SMTP id t17mr845151wrv.405.1632341155821; Wed, 22 Sep 2021 13:05:55 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:3b88::cde]) by smtp.gmail.com with ESMTPSA id e2sm3219761wra.40.2021.09.22.13.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 13:05:55 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 34/47] staging: r8188eu: remove ieee80211_get_hdrlen() Date: Wed, 22 Sep 2021 22:04:07 +0200 Message-Id: <20210922200420.9693-35-straube.linux@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210922200420.9693-1-straube.linux@gmail.com> References: <20210922200420.9693-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Function ieee80211_get_hdrlen() is not used, remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_ieee80211.c | 27 -------------------- drivers/staging/r8188eu/include/ieee80211.h | 1 - 2 files changed, 28 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging/r8188eu/core/rtw_ieee80211.c index 3f0c1a78ccb1..956b9bafcdd1 100644 --- a/drivers/staging/r8188eu/core/rtw_ieee80211.c +++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c @@ -1214,33 +1214,6 @@ int ieee80211_is_empty_essid(const char *essid, int essid_len) return 1; } -int ieee80211_get_hdrlen(u16 fc) -{ - int hdrlen = 24; - - switch (WLAN_FC_GET_TYPE(fc)) { - case RTW_IEEE80211_FTYPE_DATA: - if (fc & RTW_IEEE80211_STYPE_QOS_DATA) - hdrlen += 2; - if ((fc & RTW_IEEE80211_FCTL_FROMDS) && (fc & RTW_IEEE80211_FCTL_TODS)) - hdrlen += 6; /* Addr4 */ - break; - case RTW_IEEE80211_FTYPE_CTL: - switch (WLAN_FC_GET_STYPE(fc)) { - case RTW_IEEE80211_STYPE_CTS: - case RTW_IEEE80211_STYPE_ACK: - hdrlen = 10; - break; - default: - hdrlen = 16; - break; - } - break; - } - - return hdrlen; -} - static int rtw_get_cipher_info(struct wlan_network *pnetwork) { u32 wpa_ielen; diff --git a/drivers/staging/r8188eu/include/ieee80211.h b/drivers/staging/r8188eu/include/ieee80211.h index 8df83481bf47..7e9520c7fac5 100644 --- a/drivers/staging/r8188eu/include/ieee80211.h +++ b/drivers/staging/r8188eu/include/ieee80211.h @@ -890,7 +890,6 @@ struct tx_pending { /* Baron move to ieee80211.c */ int ieee80211_is_empty_essid(const char *essid, int essid_len); -int ieee80211_get_hdrlen(u16 fc); /* Action category code */ enum rtw_ieee80211_category { -- 2.33.0