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 DDF9238BF8A for ; Mon, 9 Mar 2026 16:56:25 +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=1773075388; cv=none; b=r3MLejx25K0iWRo985sFxDkFH+ZTIC55IBb0AiQqWhI8IBsmqMvdEYpAKyvdXBViwB7Yu7q21ZPgrdYUUX8GqN4dZBNoNRzb1zODrbLX81xhXRZAZxtyrm4OF5WDKlT68e2kM3KRT52gAfwZ5UwS4sNU2m1O/G5A95mmzHZKOkQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773075388; c=relaxed/simple; bh=Ty+bt3DHtWxTOGpZD6KfZHK3GsAUR3f0B8WSx0HsVaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rYL2S2OWKnuRUCCy1dNv7C0+LWJFwTuvBZMHeQSsvXJrWm6RN/rZZfXT5/6RHg5AQHvWprYOUtqfs7dHT6okQS3CrddugqmThNZoBZrcAXY7ge/H8JQcJXiYP/3Uq3rRrKR6+I5j8T6x2OKnsBq1xIwSwcz/rmTDp9h+1/zJng0= 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=LlsER4++; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=rT4KoTLj; 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="LlsER4++"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="rT4KoTLj" 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 E6B205BE48; Mon, 9 Mar 2026 16:56:23 +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=Za0JBcT5V6vBaHOpl5CMFbXKhHQ2OBmbH88+gHAsx7k=; b=LlsER4++aMyCogtivYSWpivRxlolvtU7agME/9AmYZT5YtyWvPPufmYrSU+EnGIY2Aa45i JaBQI+3CII1YU1s0LFTylY0hhFpMU2I7oeR+0iTMobYirA+Zwu294gwmCjHoN5GUMvHmia S1+HitBc5rSZYYsV65msbz0XkXCXpDg= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=rT4KoTLj DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1773075383; 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=Za0JBcT5V6vBaHOpl5CMFbXKhHQ2OBmbH88+gHAsx7k=; b=rT4KoTLjYa71RHaWnave4MAUd2S12O4YBUzvtLkbr3YGDcTV2CPHDnBpKJ+fOz38vBRzL3 veNufqgbAG/snkjGNgiYqlmqLI1LwgJK9e2l+Vz5eyeNUTuhqmcMP/mm4wNqtMzsF+rihH u9eS80f+ZcG5F0ModBwKLwsQcjxwoNs= 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 C5F163EFDB; Mon, 9 Mar 2026 16:56:23 +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 8LY4L7f7rmlXZAAAD6G6ig (envelope-from ); Mon, 09 Mar 2026 16:56:23 +0000 From: Oliver Neukum To: andrew@lunn.ch, bjorn@mork.no, netdev@vger.kernel.org Cc: Oliver Neukum Subject: [RFCv3 03/13] net: usb: centralize usbnet_cdc_zte_rx_fixup in usbnet Date: Mon, 9 Mar 2026 17:53:26 +0100 Message-ID: <20260309165614.861929-3-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)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:mid,suse.com:dkim,suse.com:email]; 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: E6B205BE48 This helper is used by multiple drivers using usbnet. It is better to be provided by usbnet than one of them. Signed-off-by: Oliver Neukum --- drivers/net/usb/cdc_ether.c | 19 ------------------- drivers/net/usb/usbnet.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 3149fa2b6ac1..505a653d9482 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -398,25 +398,6 @@ static int usbnet_cdc_zte_bind(struct usbnet *dev, struct usb_interface *intf) return status; } -/* Make sure packets have correct destination MAC address - * - * A firmware bug observed on some devices (ZTE MF823/831/910) is that the - * device sends packets with a static, bogus, random MAC address (event if - * device MAC address has been updated). Always set MAC address to that of the - * device. - */ -int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb) -{ - if (skb->len < ETH_HLEN || !(skb->data[0] & 0x02)) - return 1; - - skb_reset_mac_header(skb); - ether_addr_copy(eth_hdr(skb)->h_dest, dev->net->dev_addr); - - return 1; -} -EXPORT_SYMBOL_GPL(usbnet_cdc_zte_rx_fixup); - /* Ensure correct link state * * Some devices (ZTE MF823/831/910) export two carrier on notifications when diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 906584cd71a4..8a9e0d98d9c6 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -2346,6 +2346,25 @@ void usbnet_cdc_status(struct usbnet *dev, struct urb *urb) } } EXPORT_SYMBOL_GPL(usbnet_cdc_status); + +/* Make sure packets have correct destination MAC address + * + * A firmware bug observed on some devices (ZTE MF823/831/910) is that the + * device sends packets with a static, bogus, random MAC address (event if + * device MAC address has been updated). Always set MAC address to that of the + * device. + */ +int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb) +{ + if (skb->len < ETH_HLEN || !(skb->data[0] & 0x02)) + return 1; + + skb_reset_mac_header(skb); + ether_addr_copy(eth_hdr(skb)->h_dest, dev->net->dev_addr); + + return 1; +} +EXPORT_SYMBOL_GPL(usbnet_cdc_zte_rx_fixup); /*-------------------------------------------------------------------------*/ static int __init usbnet_init(void) -- 2.53.0