From: Romano <unobe@cpan.org>
To: 9front@9front.org
Subject: [9front] [patch] nusb/ether followup to cs 8387
Date: Thu, 08 Apr 2021 12:27:45 -0700 [thread overview]
Message-ID: <E542595C15E50F763699741312FE0415@smtp.pobox.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
Attached is a patch to address minor issues introduced by changset
8397, or when no ethernet exists at boot. If this should go to some
other mailing list (9front-bugs?), let me know, or if there are issues
with it.
[-- Attachment #2: Type: text/plain, Size: 1683 bytes --]
changeset: 8397:c13e74f20026
branch: mbp-2011
user: Romano <unobe@cpan.org>
date: Thu Apr 08 00:58:00 2021 -0700
summary: Don't attempt to load an ether interface if none exists. nusb/serial does not handle RNDIS CSP devices, so do not load those. follow-up doc fix for changeset 6370:8d9b9553c65c.
diff -r 5c114f6f0d21 -r c13e74f20026 rc/bin/cpurc
--- a/rc/bin/cpurc Thu Apr 08 00:49:59 2021 -0700
+++ b/rc/bin/cpurc Thu Apr 08 00:58:00 2021 -0700
@@ -59,7 +59,8 @@
addrs=`{ndb/query -a sys $sysname ether}
if(! ~ $#addrs 0){
for(ether in /net/ether*){
- addr=`{cat $ether/addr}
+ if(test -d $ether)
+ addr=`{cat $ether/addr}
switch($addr){
case $addrs
# try /lib/ndb first, then do dhcp/slaac
diff -r 5c114f6f0d21 -r c13e74f20026 rc/bin/nusbrc
--- a/rc/bin/nusbrc Thu Apr 08 00:49:59 2021 -0700
+++ b/rc/bin/nusbrc Thu Apr 08 00:58:00 2021 -0700
@@ -14,8 +14,9 @@
case *01
nusb/audio $id
case *02
- # serial and ethernet
- nusb/serial $id
+ # serial and ethernet: 0xff0202 is RNDIS, handled by nusbrc
+ if(! ~ $4 ff0202)
+ nusb/serial $id
# handled /sys/src/9/boot/nusbrc
# nusb/ether $id
case *03
diff -r 5c114f6f0d21 -r c13e74f20026 sys/src/cmd/nusb/ether/ether.c
--- a/sys/src/cmd/nusb/ether/ether.c Thu Apr 08 00:49:59 2021 -0700
+++ b/sys/src/cmd/nusb/ether/ether.c Thu Apr 08 00:58:00 2021 -0700
@@ -849,7 +849,7 @@
nerr = 0;
for(;;){
- /* receive allocates buffer and calls etheriq(b, 1); */
+ /* receive allocates buffer and calls etheriq(b); */
if((*epreceive)(epin) < 0){
rerrstr(err, sizeof(err));
if(strstr(err, "interrupted") || strstr(err, "timed out"))
next reply other threads:[~2021-04-08 19:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 19:27 Romano [this message]
2021-04-08 19:51 ` cinap_lenrek
2021-04-09 18:00 ` Romano
2021-04-10 12:12 ` cinap_lenrek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E542595C15E50F763699741312FE0415@smtp.pobox.com \
--to=unobe@cpan.org \
--cc=9front@9front.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).