From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 E7A713E9F6F for ; Mon, 9 Mar 2026 16:56:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773075403; cv=none; b=a3Ai9jbH2arQhJf1TZ45lfRasI4IO3lyDdLYh6itaeX3ODz1hiLPRhJztyCa/Zv1pf7HOrDtnKYttjVGTf6i4UZKtNrJvPTrMGmAyQgq04T068aJDwzCqT5+8dhjhl4rUeG7TeNL/Nk6EodyOlQVlpnKpcRXwAA4ivqPBy0H+NE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773075403; c=relaxed/simple; bh=f8Ezb1HGJZjqP6xdd3vQrN95inIqT/jtiWwSRyxg1Y4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ey27BbLqDc7qg1gxW5Aoc+SST3j6sb8IID/acUR8XwDgTAGruR+uNO2NTXTlev6VqYve/+4PGMdC3Rue4qS6DbYJmrQNAp/czYr0rbLKx/TDa8l2Zv//mFgXj2YhGtwhLjgjZxtFe1j7c4JlsA2pVeCWrR6crGalD0SFd5KA1PQ= 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; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=JqeDgNP/; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=JqeDgNP/; arc=none smtp.client-ip=195.135.223.131 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="JqeDgNP/"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="JqeDgNP/" 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-out2.suse.de (Postfix) with ESMTPS id 882BA5BE4F; Mon, 9 Mar 2026 16:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773075384; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aLSf/PcMC7QaOrZENtjYQLb4KpdtII/S31mefidnsnU=; b=JqeDgNP/c0NhSUXz/BX98EahniNkLJtyOPlKG8MK3mxYI3aPjMUptJNhE4acaJbYv4uYwj Dz6AD6PiudbVw0PhcjR7fwA2jejqtCynpgrjnuPEB6C3Q2QFzgc2xEDjCOatwTlUyHRgB8 lh7ox91bLCBr82MXdKldNil5NyPKW4s= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b="JqeDgNP/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773075384; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aLSf/PcMC7QaOrZENtjYQLb4KpdtII/S31mefidnsnU=; b=JqeDgNP/c0NhSUXz/BX98EahniNkLJtyOPlKG8MK3mxYI3aPjMUptJNhE4acaJbYv4uYwj Dz6AD6PiudbVw0PhcjR7fwA2jejqtCynpgrjnuPEB6C3Q2QFzgc2xEDjCOatwTlUyHRgB8 lh7ox91bLCBr82MXdKldNil5NyPKW4s= 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 686073EFDA; Mon, 9 Mar 2026 16:56:24 +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 4AtbGLj7rmlXZAAAD6G6ig (envelope-from ); Mon, 09 Mar 2026 16:56:24 +0000 From: Oliver Neukum To: andrew@lunn.ch, bjorn@mork.no, netdev@vger.kernel.org Cc: Oliver Neukum Subject: [RFCv3 07/13] net: usb: use cdc_state in struct usbnet Date: Mon, 9 Mar 2026 17:53:30 +0100 Message-ID: <20260309165614.861929-7-oneukum@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309165614.861929-1-oneukum@suse.com> References: <20260309165614.861929-1-oneukum@suse.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:mid,suse.com:dkim,suse.com:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Action: no action X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 882BA5BE4F Remove private copies as now a central state can be used. Signed-off-by: Oliver Neukum --- drivers/net/usb/cdc_ether.c | 6 +++--- drivers/net/usb/rndis_host.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c24c14702f4b..dafc2462be98 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 = usbnet_priv(dev); + struct cdc_state *info = &dev->cdc; int status; int rndis; bool android_rndis_quirk = false; @@ -327,7 +327,7 @@ EXPORT_SYMBOL_GPL(usbnet_ether_cdc_bind); void usbnet_cdc_unbind(struct usbnet *dev, struct usb_interface *intf) { - struct cdc_state *info = usbnet_priv(dev); + struct cdc_state *info = &dev->cdc; struct usb_driver *driver = driver_of(intf); /* combined interface - nothing to do */ @@ -365,7 +365,7 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind); int usbnet_cdc_bind(struct usbnet *dev, struct usb_interface *intf) { int status; - struct cdc_state *info = usbnet_priv(dev); + 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 7b3739b29c8f..6aed29dfa021 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.53.0