From nobody Tue Dec 2 00:24:05 2025 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 03D36319618 for ; Tue, 25 Nov 2025 11:21:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764069678; cv=none; b=NSfBkcnCWTXMUSPgq63jn6HFU7v9jUT4EHYKzlBg7NvdepsiNA4Sbk8pdXXVvWZ7seF46ekZjZd1rfOB2WHfeORMvcPofMn0OZhIVdWFNDWSEb3LfY8scmDW1WZo67zQsVBltR3ofLS7LmAy2J0gKKo7O4UNSB5NC3AKHUgDYqY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764069678; c=relaxed/simple; bh=5A2pDKNhbF0/77JU3bsQaFVBTUYS4izX+U7cPkgVXAw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IQI9KU7OtBYY18z23IiKa9xAunSmew1m5r3aaifV4kYWnOY6jsiVNR8DIfjM3Ztvv7yYCfBag0w2oYAJiYQS4YA/KFgnr/oi3hVStcFuJp0/++rLJyofyDFjeDNIt4cPpHcRucPhzz5BnmycysA6Nw62ujPnPDUD6y83NiU8Pqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mnsEEZjM; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mnsEEZjM" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-343dfb673a8so5293676a91.0 for ; Tue, 25 Nov 2025 03:21:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764069676; x=1764674476; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nYCzOSmeD3AlFpQHOBdKOssS9JyrnynNQJZhTfGWgls=; b=mnsEEZjM+euB3/JaTwBkMP++itMWV6sbddrXm7fP40JjhDq4HxEbF421WrjJTqpf3L F9lqKyJesaw5UYzBXMnGg6MFWnQb/1DkXwWApfvbiOiN5V8jDnDAoQrs+DtQuvgKvZ1j zU8m6BxrgkVvt8v5zxfbpZJvcPTM8wxMh2WBpTSVdn217cStenTDG9KF8fiLFZD+H7lw 4w0XIQDjDnweY8nqkjLDxS4rh08eQgggVvO0XMeLQIK6dXjCFrAQeTo8LT89QYFrOh+d QDeWKtnDmH3zBlQ1RGUvRquKir7oC3ONix53T28ijAUE/lr9bPVS+QcMAQFA11BVJ0ez Lptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764069676; x=1764674476; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nYCzOSmeD3AlFpQHOBdKOssS9JyrnynNQJZhTfGWgls=; b=Xx+YHQEbKPKoN/uX+4dlhXoIx51C83T1QmvrM9B7Xzq9kyklSKUM+woK7npOoRu3Ik 6tpM1IyaRqwCUiCkuWKzsfhumQFEjC57TxaWjqLD8PQX0PCj1Sn9xZC+Yo/O8BOY+APJ ZkZ+Q4kIUwv9bZsZ6HoZLFJhXTFWT7b8ZzPRswLuligDm2Zb3vaDs/Cy8auS3JmkLkY3 7463Pl7j3EuQnkOwDoq8e+oaw8rYYoHJU+OgkRP+WQ7xBltWixTGb8+QWkT52BbqZy/G TQ2HIbjwj532jyYxshiW5VcTr3Ogp+q6Mk70vrnwkC83GIqrqu5fbiri7e4HK9y1UfyQ 0vPg== X-Forwarded-Encrypted: i=1; AJvYcCV6zIu17CCLTGt/BqinxsjeD2nmNnNJfHrQ96Mec4YRmL24Ano5JDtK0p9/bNoWbzWgZ0Fa+qfOnQAwLjo=@vger.kernel.org X-Gm-Message-State: AOJu0YydmScdqCG4HG5Aymqv29CzHaryCUfvRcpCBW4LI/myhxL3rKRE Tqt5TY7lK+pJI0mesm1sUT7NQea2V+1iqhIgP1UnkHkTFyRMHzs4rqQH77+qVPzjEV7CHQ== X-Gm-Gg: ASbGncvqzlAvJPHmfRCxdAyQ6/FxMF9MEKLbwsWl2eRsDBrZB/ZW/JHXsYiw7TDgNPE 2Lnt3c/Zs9X0ajawhrNXgMJB5FdaBCv6bPJiXal9gb92wmkdZyBbYNOv95qVxIRor9UwQCHdIPs boRBeQi0aiNJKl7mhJICRbeVCT2R5/6vg5Z8gbTQwjrbKgUA+DFo4U/4vRgBhZs/CScRP6uY7GN DlibRHyR1Nj8GZhuv1rNLwzAFNVGLQxE0NTKav6T78t5GQguJj/++zixjmVlfy+HWKwj8J/iw69 g9Qg8cnWsDg/O4HzJFBe/ha1pGnN3s6lE8zCeAZ4PCF7t8c85bzow9Lo5dw2jlC9sWncGpRZyK0 Dny3CSX19arDpTlDaEMJRqNZGaoJkeH9R4cJRnyvcPTsZf0WTVyxhUz0MUcXYfbihCfABe9bVjL xTSbXI0j6clzqBVRHVuHyimeaTrSrY4qtX3cu8EqsZmWDJsODdn8VqbR0F1ojnEkOqNebB/sblZ QL8G0sTFXXtin6C6YrUvkn/agX78xLspcIQOnq48umZbz36Chw0RlhDfiSoDBuxGWuxb4enp+Dn iBtqeTflJTAdJcA3Tjs= X-Google-Smtp-Source: AGHT+IH5lMArkNfhsGEGK/fgLgKF5OQcQdSf/g81Ys6AxJe2WVkBUoOLKtd7yNl3CKRxVTK3S/lf+g== X-Received: by 2002:a17:90b:1fc5:b0:32b:9750:10e4 with SMTP id 98e67ed59e1d1-34733f3eb71mr15682419a91.27.1764069676199; Tue, 25 Nov 2025 03:21:16 -0800 (PST) Received: from cyberkunju.asia-south1-c.c.gen-lang-client-0196962068.internal (125.31.93.34.bc.googleusercontent.com. [34.93.31.125]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34727bcaf13sm16296250a91.1.2025.11.25.03.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 03:21:15 -0800 (PST) From: Navaneeth K To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, dan.carpenter@linaro.org, david.laight@runbox.com, Navaneeth K Subject: [PATCH v2 2/5] staging: rtl8723bs: use standard offsetof in cfg80211 operations Date: Tue, 25 Nov 2025 11:20:56 +0000 Message-ID: <20251125112059.16913-3-knavaneeth786@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251125112059.16913-1-knavaneeth786@gmail.com> References: <20251125112059.16913-1-knavaneeth786@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace usage of the custom FIELD_OFFSET macro with the standard offsetof() macro in ioctl_cfg80211.c. This improves code readability and uses the kernel's standard mechanism. Also include in basic_types.h to ensure offsetof() is available for this and future conversions. Signed-off-by: Navaneeth K --- drivers/staging/rtl8723bs/include/basic_types.h | 1 + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/include/basic_types.h b/drivers/stag= ing/rtl8723bs/include/basic_types.h index 1c2da18e6210..16b270fe0203 100644 --- a/drivers/staging/rtl8723bs/include/basic_types.h +++ b/drivers/staging/rtl8723bs/include/basic_types.h @@ -12,6 +12,7 @@ #define FAIL (-1) =20 #include +#include =20 #define FIELD_OFFSET(s, field) ((__kernel_ssize_t)&((s *)(0))->field) =20 diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 315bab373729..60edeae1cffe 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1712,7 +1712,8 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, = struct net_device *ndev, =20 if (wep_key_len > 0) { wep_key_len =3D wep_key_len <=3D 5 ? 5 : 13; - wep_total_len =3D wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, ke= y_material); + wep_total_len =3D wep_key_len + + offsetof(struct ndis_802_11_wep, key_material); pwep =3D rtw_malloc(wep_total_len); if (!pwep) { ret =3D -ENOMEM; --=20 2.43.0