From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 60E2A42A7A7 for ; Thu, 9 Jul 2026 12:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783598528; cv=none; b=VJ4zJe6qFUrG+BV+v21RnxNgvDXCSoIPD9pmNG0u6B8gXMLKA5nkThFHmDCEgLS3gnTBoKxmD+ln/OS+I1yvOW9TDqmQFrhCc938InOHnj5Qd3zd/yQHhCE3ayYOQ0sGA4G92+3KGBHAWrydDoIcMkH81rwsdxvmNoh3TqE16Vk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783598528; c=relaxed/simple; bh=p5LEF0TpeuJUKX9WSanvmmAQejWqAwoFRjpWjPdXn3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YrRu/g7rq6SefU9aHwF+G0E9Rfy+5m4i3f3R3TOGQQFYBfzDdgXzGeBdSgrZG7essvPdtEfdWDRJBl6EKAWyxQGC1/kmMlwOeJwuhWiORoUSCPra22KNbXU7KiGfQb5CbxK8+XQB9ETHdT4mXhH+wURHRx2zssa0Kmwar5yEe5Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 75C79761BB; Thu, 9 Jul 2026 12:01:20 +0000 (UTC) Authentication-Results: smtp-out1.suse.de; none Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3DF12779AD; Thu, 9 Jul 2026 12:01:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 8GISDpCNT2pEWQAAD6G6ig (envelope-from ); Thu, 09 Jul 2026 12:01:20 +0000 From: Oliver Neukum To: andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, manuelebner@mailbox.org Cc: Oliver Neukum Subject: [PATCHv2 net-next 3/7] net: usb: use cdc_state in struct usbnet Date: Thu, 9 Jul 2026 14:01:12 +0200 Message-ID: <20260709120116.1423033-3-oneukum@suse.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260709120116.1423033-1-oneukum@suse.com> References: <20260709120116.1423033-1-oneukum@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spam-Flag: NO X-Spam-Score: -4.00 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.00 / 50.00]; REPLY(-4.00)[]; TAGGED_RCPT(0.00)[netdev]; ASN_FAIL(0.00)[7.9.0.0.4.6.0.0.0.5.1.0.0.1.0.0.4.0.1.0.1.8.2.b.0.4.e.d.7.0.a.2.asn6.rspamd.com:server fail] X-Rspamd-Queue-Id: 75C79761BB X-Rspamd-Action: no action Remove private copies as now a central state can be used. Signed-off-by: Oliver Neukum --- drivers/net/usb/cdc_ether.c | 9 +++------ drivers/net/usb/rndis_host.c | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index e688fb99c61d..76ad4ffa950a 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -85,7 +85,7 @@ int usbnet_generic_cdc_bind(struct usbnet *dev, struct usb_interface *intf) u8 *buf = intf->cur_altsetting->extra; int len = intf->cur_altsetting->extralen; struct usb_interface_descriptor *d; - struct cdc_state *info = (void *) &dev->data; + struct cdc_state *info = &dev->cdc; int status = -ENODEV; int rndis; bool android_rndis_quirk = false; @@ -336,7 +336,7 @@ EXPORT_SYMBOL_GPL(usbnet_ether_cdc_bind); void usbnet_cdc_unbind(struct usbnet *dev, struct usb_interface *intf) { - struct cdc_state *info = (void *) &dev->data; + struct cdc_state *info = &dev->cdc; struct usb_driver *driver = driver_of(intf); /* combined interface - nothing to do */ @@ -374,10 +374,7 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind); int usbnet_cdc_bind(struct usbnet *dev, struct usb_interface *intf) { int status; - struct cdc_state *info = (void *) &dev->data; - - BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) - < sizeof(struct cdc_state))); + struct cdc_state *info = &dev->cdc; status = usbnet_ether_cdc_bind(dev, intf); if (status < 0) diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 5e39d05a2d7b..d539654687c3 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -57,7 +57,7 @@ EXPORT_SYMBOL_GPL(rndis_status); static void rndis_msg_indicate(struct usbnet *dev, struct rndis_indicate *msg, int buflen) { - struct cdc_state *info = (void *)&dev->data; + struct cdc_state *info = &dev->cdc; struct device *udev = &info->control->dev; if (dev->driver_info->indication) { @@ -90,7 +90,7 @@ static void rndis_msg_indicate(struct usbnet *dev, struct rndis_indicate *msg, */ int rndis_command(struct usbnet *dev, struct rndis_msg_hdr *buf, int buflen) { - struct cdc_state *info = (void *) &dev->data; + struct cdc_state *info = &dev->cdc; struct usb_cdc_notification notification; int master_ifnum; int retval; @@ -290,7 +290,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) { int retval; struct net_device *net = dev->net; - struct cdc_state *info = (void *) &dev->data; + struct cdc_state *info = &dev->cdc; union { void *buf; struct rndis_msg_hdr *header; -- 2.54.0