Maciej Żenczykowski c1a3d40673 net: cdc_ncm: switch to eth%d interface naming ... This is meant to make the host side cdc_ncm interface consistently named just like the older CDC protocols: cdc_ether & cdc_ecm (and even rndis_host), which all use 'FLAG_ETHER | FLAG_POINTTOPOINT'. include/linux/usb/usbnet.h: #define FLAG_ETHER 0x0020 /* maybe use "eth%d" names */ #define FLAG_WLAN 0x0080 /* use "wlan%d" names */ #define FLAG_WWAN 0x0400 /* use "wwan%d" names */ #define FLAG_POINTTOPOINT 0x1000 /* possibly use "usb%d" names */ drivers/net/usb/usbnet.c @ line 1711: strcpy (net->name, "usb%d"); ... // heuristic: "usb%d" for links we know are two-host, // else "eth%d" when there's reasonable doubt. userspace // can rename the link if it knows better. if ((dev->driver_info->flags & FLAG_ETHER) != 0 && ((dev->driver_info->flags & FLAG_POINTTOPOINT) == 0 || (net->dev_addr [0] & 0x02) == 0)) strcpy (net->name, "eth%d"); /* WLAN devices should always be named "wlan%d" */ if ((dev->driver_info->flags & FLAG_WLAN) != 0) strcpy(net->name, "wlan%d"); /* WWAN devices should always be named "wwan%d" */ if ((dev->driver_info->flags & FLAG_WWAN) != 0) strcpy(net->name, "wwan%d"); So by using ETHER | POINTTOPOINT the interface naming is either usb%d or eth%d based on the global uniqueness of the mac address of the device. Without this 2.5gbps ethernet dongles which all seem to use the cdc_ncm driver end up being called usb%d instead of eth%d even though they're definitely not two-host. (All 1gbps & 5gbps ethernet usb dongles I've tested don't hit this problem due to use of different drivers, primarily r8152 and aqc111) Fixes tag is based purely on git blame, and is really just here to make sure this hits LTS branches newer than v4.5. Cc: Lorenzo Colitti <lorenzo@google.com> Fixes: 4d06dd537f ("cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind") Signed-off-by: Maciej Żenczykowski <maze@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2021-06-15 11:24:57 -07:00
..
accessibility	TTY/Serial driver updates for 5.13-rc1	2021-04-26 11:20:10 -07:00
acpi	libnvdimm fixes for 5.13-rc2	2021-05-15 08:32:51 -07:00
amba
android	binder: Return EFAULT if we fail BINDER_ENABLE_ONEWAY_SPAM_DETECTION	2021-05-13 20:35:26 +02:00
ata	pci-v5.13-changes	2021-05-05 13:24:11 -07:00
atm	atm: firestream: Use fallthrough pseudo-keyword	2021-05-07 16:01:08 -07:00
auxdisplay	treewide: remove editor modelines and cruft	2021-05-07 00:26:34 -07:00
base	Driver core fixes for 5.13-rc2	2021-05-16 10:13:14 -07:00
bcma	bcma: remove unused function	2021-04-18 09:36:56 +03:00
block	block-5.13-2021-05-14	2021-05-15 08:52:30 -07:00
bluetooth	Bluetooth: btusb: Fix failing to init controllers with operation firmware	2021-06-03 14:02:17 -07:00
bus	ARM: SoC drivers for v5.13	2021-04-26 12:11:52 -07:00
cdrom	cdrom: gdrom: initialize global variable at init time	2021-05-13 18:58:44 +02:00
char	Char/misc driver fixes for 5.13-rc3	2021-05-20 06:31:52 -10:00
clk	clk: Skip clk provider registration when np is NULL	2021-05-11 08:47:25 +02:00
clocksource	clocksource/drivers/hyper-v: Re-enable VDSO_CLOCKMODE_HVCLOCK on X86	2021-05-14 14:55:13 +02:00
comedi	staging: comedi: move out of staging directory	2021-04-15 09:26:25 +02:00
connector
counter
cpufreq	Fix an idle CPU selection bug, and an AMD Ryzen maximum frequency enumeration bug.	2021-05-15 10:24:48 -07:00
cpuidle
crypto	Revert "crypto: cavium/nitrox - add an error message to explain the failure of pci_request_mem_regions"	2021-05-13 17:23:05 +02:00
cxl	cxl/mem: Fix memory device capacity probing	2021-04-16 18:21:56 -07:00
dax
dca
devfreq
dio
dma	dmaengine: qcom_hidma: comment platform_driver_register call	2021-05-13 18:32:29 +02:00
dma-buf	dma-buf: fix unintended pin/unpin warnings	2021-05-20 14:02:27 +02:00
edac	x86/msr: Rename MSR_K8_SYSCFG to MSR_AMD64_SYSCFG	2021-05-10 07:51:38 +02:00
eisa
extcon	- Core Frameworks	2021-04-28 15:59:13 -07:00
firewire	The usual updates from the irq departement:	2021-04-26 09:43:16 -07:00
firmware	ARM: SoC fixes for 5.13	2021-05-20 14:46:26 -10:00
fpga	ARM: SoC drivers for v5.13	2021-04-26 12:11:52 -07:00
fsi
gnss
gpio	gpio: tegra186: Don't set parent IRQ affinity	2021-05-12 13:56:43 +02:00
gpu	drm fixes for 5.13-rc3	2021-05-20 20:15:43 -10:00
greybus	greybus: es2: fix kernel-doc warnings	2021-04-16 07:26:50 +02:00
hid	Merge branch 'for-5.13/warnings' into for-linus	2021-04-29 21:47:22 +02:00
hsi	HSI: core: fix resource leaks in hsi_add_client_from_dt()	2021-04-16 00:14:49 +02:00
hv	printk changes for 5.13	2021-04-27 18:09:44 -07:00
hwmon	Char/misc driver fixes for 5.13-rc3	2021-05-20 06:31:52 -10:00
hwspinlock
hwtracing	ARM:	2021-05-01 10:14:08 -07:00
i2c	Merge branch 'i2c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2021-04-30 13:01:02 -07:00
i3c	Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register"	2021-04-24 22:21:01 +02:00
ide
idle
iio	iio: tsl2583: Fix division by a zero lux_val	2021-05-10 14:01:48 +01:00
infiniband	Networking fixes for 5.13-rc4, including fixes from bpf, netfilter,	2021-05-26 17:44:49 -10:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2021-05-06 23:37:55 -07:00
interconnect	CFI on arm64 series for v5.13-rc1	2021-04-27 10:16:46 -07:00
iommu	pci-v5.13-changes	2021-05-05 13:24:11 -07:00
ipack
irqchip	irqchip: Remove redundant error printing	2021-05-16 13:07:18 +01:00
isdn	Networking fixes for 5.13-rc4, including fixes from bpf, netfilter,	2021-05-26 17:44:49 -10:00
leds	leds: lp5523: check return value of lp5xx_read and jump to cleanup code	2021-05-13 17:30:15 +02:00
lightnvm	lightnvm: deprecated OCSSD support and schedule it for removal in Linux 5.15	2021-04-13 09:16:12 -06:00
macintosh	macintosh/via-pmu: Fix build warning	2021-04-16 23:57:51 +10:00
mailbox	- qcom: enable support for SM8350 and SC7280	2021-04-28 16:10:33 -07:00
mcb
md	dm integrity: fix sparse warnings	2021-05-13 14:53:49 -04:00
media	media: gspca: properly check for errors in po1030_probe()	2021-05-13 18:58:32 +02:00
memory	.gitignore: prefix local generated files with a slash	2021-05-02 00:43:35 +09:00
memstick	memstick: r592: ignore kfifo_out() return code again	2021-04-26 11:08:23 +02:00
message	scsi: message: fusion: Remove unused local variable 'vtarget'	2021-04-13 01:39:12 -04:00
mfd	- Core Frameworks	2021-04-28 15:59:13 -07:00
misc	platform-drivers-x86 for v5.13-2	2021-05-20 06:40:20 -10:00
mmc	mmc: sdhci-pci-gli: increase 1.8V regulator wait	2021-05-10 14:39:06 +02:00
most	Staging/IIO driver updates for 5.13-rc1	2021-04-26 11:14:21 -07:00
mtd	mtd: parsers: ofpart: fix parsing subpartitions	2021-05-10 18:34:30 +02:00
mux
net	net: cdc_ncm: switch to eth%d interface naming	2021-06-15 11:24:57 -07:00
nfc	NFC: nfcmrvl: fix kernel-doc syntax in file headers	2021-05-23 17:26:38 -07:00
ntb
nubus
nvdimm	include: remove pagemap.h from blkdev.h	2021-05-06 19:24:11 -07:00
nvme	nvme-fc: clear q_live at beginning of association teardown	2021-05-19 08:40:24 +02:00
nvmem
of	of: overlay: Remove redundant assignment to ret	2021-05-03 13:57:56 -05:00
opp
parisc
parport	treewide: remove editor modelines and cruft	2021-05-07 00:26:34 -07:00
pci	more s390 updates for 5.13 merge window	2021-05-06 14:39:50 -07:00
pcmcia
perf	ARM:	2021-05-01 10:14:08 -07:00
phy	Networking changes for 5.13.	2021-04-29 11:57:23 -07:00
pinctrl	linux/kconfig.h: replace IF_ENABLED() with PTR_IF() in <linux/kernel.h>	2021-05-09 00:29:45 +09:00
platform	platform/x86: touchscreen_dmi: Add info for the Chuwi Hi10 Pro (CWI529) tablet	2021-05-20 14:11:03 +02:00
pnp
power	power supply and reset changes for the v5.13 series	2021-04-28 15:43:58 -07:00
powercap
pps	TTY/Serial driver updates for 5.13-rc1	2021-04-26 11:20:10 -07:00
ps3
ptp	ptp: improve max_adj check against unreasonable values	2021-06-15 10:59:46 -07:00
pwm	pwm: Changes for v5.13-rc1	2021-05-05 12:53:16 -07:00
rapidio	rapidio: handle create_workqueue() failure	2021-05-13 18:32:19 +02:00
ras
regulator	- Core Frameworks	2021-04-28 15:59:13 -07:00
remoteproc	remoteproc updates for v5.13	2021-05-04 11:13:33 -07:00
reset	pci-v5.13-changes	2021-05-05 13:24:11 -07:00
rpmsg
rtc	RTC for 5.13	2021-05-03 12:15:21 -07:00
s390	block-5.13-2021-05-07	2021-05-07 11:35:12 -07:00
sbus
scsi	SCSI fixes on 20210520	2021-05-20 14:41:35 -10:00
sh	The usual updates from the irq departement:	2021-04-26 09:43:16 -07:00
siox
slimbus
soc	IOMMU Updates for Linux v5.13	2021-05-01 09:33:00 -07:00
soundwire
spi	spi: sc18is602: implement .max_{transfer,message}_size() for the controller	2021-05-21 13:13:33 +01:00
spmi
ssb
staging	staging: rtl8723bs: fix monitor netdev register/unregister	2021-05-31 21:27:15 +02:00
target	SCSI misc on 20210508	2021-05-08 10:44:36 -07:00
tc
tee	AMD-TEE reference count loaded TAs	2021-05-17 16:06:02 +02:00
thermal	- Remove duplicate error message for the amlogic driver (Tang Bin)	2021-05-05 12:46:48 -07:00
thunderbolt	thunderbolt: Changes for v5.13 merge window	2021-04-13 12:17:14 +02:00
tty	Char/misc driver fixes for 5.13-rc3	2021-05-20 06:31:52 -10:00
uio	uio_hv_generic: Fix another memory leak in error handling paths	2021-05-14 13:26:04 +02:00
usb	Driver core fixes for 5.13-rc2	2021-05-16 10:13:14 -07:00
vdpa	{net,vdpa}/mlx5: Configure interface MAC into mpfs L2 table	2021-05-18 23:01:48 -07:00
vfio	IOMMU Updates for Linux v5.13	2021-05-01 09:33:00 -07:00
vhost	virtio,vhost,vdpa: features, fixes	2021-05-05 13:31:39 -07:00
video	Char/misc driver fixes for 5.13-rc3	2021-05-20 06:31:52 -10:00
virt	nitro_enclaves: Fix stale file descriptors on failed usercopy	2021-04-29 19:06:49 +02:00
virtio	virtio_pci_modern: correct sparse tags for notify	2021-05-04 04:19:59 -04:00
visorbus
vlynq
vme
w1
watchdog	- Core Frameworks	2021-04-28 15:59:13 -07:00
xen	xen-pciback: reconfigure also from backend watch handler	2021-05-21 09:55:16 +02:00
zorro
Kconfig	staging: comedi: move out of staging directory	2021-04-15 09:26:25 +02:00
Makefile	virtio,vhost,vdpa: features, fixes	2021-05-05 13:31:39 -07:00