summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2021-04-08 21:57:24 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2021-04-08 21:57:24 +0200
commit777b1949b2475a4d989533ce200e2f8312fb89ca (patch)
tree2eafab383216792da5972a046cea566be6ff7516
parentaebdf1010bf26d9135de4d974b61da5a5a016961 (diff)
downloadplan9front-777b1949b2475a4d989533ce200e2f8312fb89ca.tar.xz
nusbrc: ignore rndis ethernet in /rc/bin/nusbed, handled by /sys/src/9/boot/nusbrc (thanks romano)
-rwxr-xr-xrc/bin/nusbrc2
-rwxr-xr-xsys/src/9/boot/nusbrc9
2 files changed, 6 insertions, 5 deletions
diff --git a/rc/bin/nusbrc b/rc/bin/nusbrc
index fdc6b2f37..63a28b25b 100755
--- a/rc/bin/nusbrc
+++ b/rc/bin/nusbrc
@@ -13,6 +13,8 @@ if(! bind -a '#u' /dev)
switch($4){
case *01
nusb/audio $id
+ case ff0202
+ # RNDIS; handled by /sys/src/9/boot/nusbrc
case *02
# serial and ethernet
nusb/serial $id
diff --git a/sys/src/9/boot/nusbrc b/sys/src/9/boot/nusbrc
index 43ce0a6e1..5f2a4d407 100755
--- a/sys/src/9/boot/nusbrc
+++ b/sys/src/9/boot/nusbrc
@@ -33,12 +33,11 @@ if(! nusb/usbd)
switch($4){
case *03
nusb/kb $id
+ case ff0202
+ nusb/ether -t rndis $etherargs $id
case *02
- # RNDIS, otherwise CDC ethernet
- if(~ $4 ff0202)
- nusb/ether -t rndis $etherargs $id
- if not
- nusb/ether $etherargs $id
+ # CDC ethernet
+ nusb/ether $etherargs $id
case *08
if(nusb/disk $id) @{
rfork ne