Plan 9 from Bell Labs 2008-02-01

dist/replica/_plan9.db

@@ -36,7 +36,7 @@
 386/bin/ape/stty - 775 sys sys 1148500571 41080
 386/bin/ape/tar - 775 sys sys 1168402264 62184
 386/bin/ape/uname - 775 sys sys 1173754552 134895
-386/bin/aquarela - 775 sys sys 1200631754 337609
+386/bin/aquarela - 775 sys sys 1201753315 337721
 386/bin/ar - 775 sys sys 1178939751 114363
 386/bin/archfs - 775 sys sys 1179372067 146788
 386/bin/ascii - 775 sys sys 1168402265 64884
@@ -44,7 +44,7 @@
 386/bin/auth - 20000000775 sys sys 1016920815 0
 386/bin/auth/aescbc - 775 sys sys 1188702764 140221
 386/bin/auth/asn12rsa - 775 sys sys 1188446816 121912
-386/bin/auth/authsrv - 775 sys sys 1188446820 165258
+386/bin/auth/authsrv - 775 sys sys 1201753318 165370
 386/bin/auth/changeuser - 775 sys sys 1178568246 96020
 386/bin/auth/convkeys - 775 sys sys 1188446822 87298
 386/bin/auth/convkeys2 - 775 sys sys 1188446825 87357
@@ -54,7 +54,7 @@
 386/bin/auth/enable - 775 sys sys 1020319057 134
 386/bin/auth/factotum - 775 sys sys 1200717245 321923
 386/bin/auth/fgui - 775 sys sys 1197732639 219095
-386/bin/auth/guard.srv - 775 sys sys 1188446841 144638
+386/bin/auth/guard.srv - 775 sys sys 1201753321 144750
 386/bin/auth/keyfs - 775 sys sys 1191035876 116576
 386/bin/auth/login - 775 sys sys 1196742440 104821
 386/bin/auth/newns - 775 sys sys 1179372070 90035
@@ -70,7 +70,7 @@
 386/bin/auth/rsagen - 775 sys sys 1178568249 151953
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
 386/bin/auth/secstore - 775 sys sys 1188702769 192724
-386/bin/auth/secstored - 775 sys sys 1188702773 197480
+386/bin/auth/secstored - 775 sys sys 1201753324 197600
 386/bin/auth/secuser - 775 sys sys 1188702776 149443
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
@@ -177,7 +177,7 @@
 386/bin/cfs - 775 sys sys 1190863294 130565
 386/bin/chgrp - 775 sys sys 1168402294 59522
 386/bin/chmod - 775 sys sys 1168402294 62518
-386/bin/cifscmd - 775 sys sys 1200631760 348455
+386/bin/cifscmd - 775 sys sys 1201753330 348567
 386/bin/cleanname - 775 sys sys 1168402295 58541
 386/bin/clock - 775 sys sys 1197732691 157356
 386/bin/cmp - 775 sys sys 1157597609 40658
@@ -250,7 +250,7 @@
 386/bin/fs/v10fs - 775 sys sys 1178568274 94797
 386/bin/fs/v6fs - 775 sys sys 1178568274 93881
 386/bin/fs/zipfs - 775 sys sys 1178568274 108444
-386/bin/ftpfs - 775 sys sys 1188446930 271820
+386/bin/ftpfs - 775 sys sys 1201753335 271932
 386/bin/games - 20000000775 sys sys 1096298711 0
 386/bin/games/4s - 775 sys sys 1197732711 177612
 386/bin/games/5s - 775 sys sys 1197732721 179900
@@ -287,9 +287,9 @@
 386/bin/import - 775 sys sys 1188447232 103492
 386/bin/iostats - 775 sys sys 1178568280 98906
 386/bin/ip - 20000000775 sys sys 1016920851 0
-386/bin/ip/6in4 - 775 sys sys 1187061208 91687
+386/bin/ip/6in4 - 775 sys sys 1201753336 91799
 386/bin/ip/dhcpclient - 775 sys sys 1178568281 92992
-386/bin/ip/dhcpd - 775 sys sys 1198211701 151356
+386/bin/ip/dhcpd - 775 sys sys 1201753339 151468
 386/bin/ip/dhcpleases - 775 sys sys 1198211703 85140
 386/bin/ip/ftpd - 775 sys sys 1200262762 170828
 386/bin/ip/gping - 775 sys sys 1198211707 182214
@@ -305,16 +305,16 @@
 386/bin/ip/httpd/wikipost - 775 sys sys 1191273662 114183
 386/bin/ip/httpfile - 775 sys sys 1188447244 284004
 386/bin/ip/imap4d - 775 sys sys 1188447250 236867
-386/bin/ip/ipconfig - 775 sys sys 1186112228 159700
+386/bin/ip/ipconfig - 775 sys sys 1201753341 159810
 386/bin/ip/linklocal - 775 sys sys 1197732767 45613
-386/bin/ip/ping - 775 sys sys 1198211709 93164
-386/bin/ip/ppp - 775 sys sys 1188447254 220265
+386/bin/ip/ping - 775 sys sys 1201753343 93276
+386/bin/ip/ppp - 775 sys sys 1201753347 220377
 386/bin/ip/pppoe - 775 sys sys 1168402326 77787
 386/bin/ip/pptp - 775 sys sys 1184731239 127160
-386/bin/ip/pptpd - 775 sys sys 1178568289 124670
-386/bin/ip/rarpd - 775 sys sys 1178654264 111254
+386/bin/ip/pptpd - 775 sys sys 1201753349 124782
+386/bin/ip/rarpd - 775 sys sys 1201753351 111368
 386/bin/ip/rexexec - 775 sys sys 1179372096 90284
-386/bin/ip/rip - 775 sys sys 1178568290 89908
+386/bin/ip/rip - 775 sys sys 1201753352 90020
 386/bin/ip/rlogind - 775 sys sys 1178568290 66192
 386/bin/ip/telnetd - 775 sys sys 1196742496 121995
 386/bin/ip/tftpd - 775 sys sys 1179372096 130740
@@ -342,19 +342,19 @@
 386/bin/mug - 775 sys sys 1197732786 176443
 386/bin/mv - 775 sys sys 1168402336 66629
 386/bin/ndb - 20000000775 sys sys 985743147 0
-386/bin/ndb/cs - 775 sys sys 1188530160 148982
+386/bin/ndb/cs - 775 sys sys 1201753355 149092
 386/bin/ndb/csquery - 775 sys sys 1176488418 61652
-386/bin/ndb/dns - 775 sys sys 1201551691 296647
-386/bin/ndb/dnsdebug - 775 sys sys 1201551695 270667
+386/bin/ndb/dns - 775 sys sys 1201753360 296759
+386/bin/ndb/dnsdebug - 775 sys sys 1201753365 270779
 386/bin/ndb/dnsquery - 775 sys sys 1185334136 64350
-386/bin/ndb/dnstcp - 775 sys sys 1201551700 268548
+386/bin/ndb/dnstcp - 775 sys sys 1201753369 268660
 386/bin/ndb/ipquery - 775 sys sys 1178568296 95524
 386/bin/ndb/mkdb - 775 sys sys 1168402340 64211
 386/bin/ndb/mkhash - 775 sys sys 1178568296 83312
 386/bin/ndb/mkhosts - 775 sys sys 1178568296 84355
 386/bin/ndb/query - 775 sys sys 1188447268 82960
 386/bin/netkey - 775 sys sys 1168402341 72717
-386/bin/netstat - 775 sys sys 1169612032 85184
+386/bin/netstat - 775 sys sys 1201753371 85222
 386/bin/news - 775 sys sys 1168402341 71956
 386/bin/nfs - 775 sys sys 1184731239 320151
 386/bin/nm - 775 sys sys 1188530182 130190
@@ -517,11 +517,11 @@
 386/bin/venti/write - 775 sys sys 1190716792 155215
 386/bin/vncs - 775 sys sys 1188447411 471527
 386/bin/vncv - 775 sys sys 1188447423 518952
-386/bin/vt - 775 sys sys 1197732850 176867
+386/bin/vt - 775 sys sys 1201753374 176609
 386/bin/vtdump - 775 sys sys 1196742626 161697
 386/bin/wc - 775 sys sys 1148500701 41191
 386/bin/webcookies - 775 sys sys 1179372114 166178
-386/bin/webfs - 775 sys sys 1200262801 360416
+386/bin/webfs - 775 sys sys 1201753380 360586
 386/bin/webfsget - 775 sys sys 1148500702 39177
 386/bin/wikifs - 775 sys sys 1200025151 203038
 386/bin/winwatch - 775 sys sys 1200262804 155342
@@ -570,7 +570,7 @@
 386/lib/libgeometry.a - 664 sys sys 1168402366 50470
 386/lib/libhtml.a - 664 sys sys 1186370975 229202
 386/lib/libhttpd.a - 664 sys sys 1191273745 100822
-386/lib/libip.a - 664 sys sys 1198211711 34710
+386/lib/libip.a - 664 sys sys 1201753381 35036
 386/lib/libl.a - 664 sys sys 1168402367 5372
 386/lib/libmach.a - 664 sys sys 1196972899 807480
 386/lib/libmemdraw.a - 664 sys sys 1168402369 284092
@@ -7825,7 +7825,7 @@ sys/man/8/INDEX.html - 664 sys sys 1196638946 8619
 sys/man/8/aan - 664 sys sys 1196638946 1670
 sys/man/8/aliasmail - 664 sys sys 1196638946 1350
 sys/man/8/apm - 664 sys sys 1196638946 1811
-sys/man/8/aquarela - 664 sys sys 1198159132 3798
+sys/man/8/aquarela - 664 sys sys 1201804560 3612
 sys/man/8/auth - 664 sys sys 1196638946 4996
 sys/man/8/boot - 664 sys sys 1196638946 8331
 sys/man/8/booting - 664 sys sys 1196638946 4136
@@ -8112,7 +8112,7 @@ sys/src/9/pc/etherelnk3.c - 664 sys sys 1158012427 48807
 sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
-sys/src/9/pc/etherigbe.c - 664 sys sys 1201296869 45773
+sys/src/9/pc/etherigbe.c - 664 sys sys 1201822310 45935
 sys/src/9/pc/etherm10g.c - 664 sys sys 1199912528 28463
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1174590360 957485
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1174590362 926959
@@ -9192,7 +9192,7 @@ sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
 sys/src/boot/pc/etherga620.c - 664 sys sys 1175289484 27168
 sys/src/boot/pc/etherga620fw.h - 664 sys sys 1174080072 222295
 sys/src/boot/pc/etherif.h - 664 sys sys 1174077279 1338
-sys/src/boot/pc/etherigbe.c - 664 sys sys 1199911516 41407
+sys/src/boot/pc/etherigbe.c - 664 sys sys 1201822335 41718
 sys/src/boot/pc/ethermii.c - 664 sys sys 1103641771 4413
 sys/src/boot/pc/ethermii.h - 664 sys sys 1071175087 3259
 sys/src/boot/pc/etherrhine.c - 664 sys sys 1199911576 12759
@@ -15856,25 +15856,3 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/ftpfs - 775 sys sys 1201753335 271932
-386/bin/netstat - 775 sys sys 1201753371 85222
-386/bin/webfs - 775 sys sys 1201753380 360586
-386/bin/aquarela - 775 sys sys 1201753315 337721
-386/bin/auth/authsrv - 775 sys sys 1201753318 165370
-386/bin/auth/guard.srv - 775 sys sys 1201753321 144750
-386/bin/auth/secstored - 775 sys sys 1201753324 197600
-386/bin/cifscmd - 775 sys sys 1201753330 348567
-386/bin/ip/6in4 - 775 sys sys 1201753336 91799
-386/bin/ip/dhcpd - 775 sys sys 1201753339 151468
-386/bin/ip/ipconfig - 775 sys sys 1201753341 159810
-386/bin/ip/ping - 775 sys sys 1201753343 93276
-386/bin/ip/ppp - 775 sys sys 1201753347 220377
-386/bin/ip/pptpd - 775 sys sys 1201753349 124782
-386/bin/ip/rarpd - 775 sys sys 1201753351 111368
-386/bin/ip/rip - 775 sys sys 1201753352 90020
-386/bin/ndb/cs - 775 sys sys 1201753355 149092
-386/bin/ndb/dns - 775 sys sys 1201753360 296759
-386/bin/ndb/dnsdebug - 775 sys sys 1201753365 270779
-386/bin/ndb/dnstcp - 775 sys sys 1201753369 268660
-386/bin/vt - 775 sys sys 1201753374 176609
-386/lib/libip.a - 664 sys sys 1201753381 35036

dist/replica/plan9.db

@@ -7825,7 +7825,7 @@ sys/man/8/INDEX.html - 664 sys sys 1196638946 8619
 sys/man/8/aan - 664 sys sys 1196638946 1670
 sys/man/8/aliasmail - 664 sys sys 1196638946 1350
 sys/man/8/apm - 664 sys sys 1196638946 1811
-sys/man/8/aquarela - 664 sys sys 1198159132 3798
+sys/man/8/aquarela - 664 sys sys 1201804560 3612
 sys/man/8/auth - 664 sys sys 1196638946 4996
 sys/man/8/boot - 664 sys sys 1196638946 8331
 sys/man/8/booting - 664 sys sys 1196638946 4136
@@ -8112,7 +8112,7 @@ sys/src/9/pc/etherelnk3.c - 664 sys sys 1158012427 48807
 sys/src/9/pc/etherga620.c - 664 sys sys 1185652495 29895
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
-sys/src/9/pc/etherigbe.c - 664 sys sys 1201296869 45773
+sys/src/9/pc/etherigbe.c - 664 sys sys 1201822310 45935
 sys/src/9/pc/etherm10g.c - 664 sys sys 1199912528 28463
 sys/src/9/pc/etherm10g2k.i - 664 sys sys 1174590360 957485
 sys/src/9/pc/etherm10g4k.i - 664 sys sys 1174590362 926959
@@ -9192,7 +9192,7 @@ sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
 sys/src/boot/pc/etherga620.c - 664 sys sys 1175289484 27168
 sys/src/boot/pc/etherga620fw.h - 664 sys sys 1174080072 222295
 sys/src/boot/pc/etherif.h - 664 sys sys 1174077279 1338
-sys/src/boot/pc/etherigbe.c - 664 sys sys 1199911516 41407
+sys/src/boot/pc/etherigbe.c - 664 sys sys 1201822335 41718
 sys/src/boot/pc/ethermii.c - 664 sys sys 1103641771 4413
 sys/src/boot/pc/ethermii.h - 664 sys sys 1071175087 3259
 sys/src/boot/pc/etherrhine.c - 664 sys sys 1199911576 12759

dist/replica/plan9.log

@@ -18392,3 +18392,6 @@
 1201753804 19 c 386/bin/ndb/dnstcp - 775 sys sys 1201753369 268660
 1201753804 20 c 386/bin/vt - 775 sys sys 1201753374 176609
 1201753804 21 c 386/lib/libip.a - 664 sys sys 1201753381 35036
+1201806004 0 c sys/man/8/aquarela - 664 sys sys 1201804560 3612
+1201822204 0 c sys/src/9/pc/etherigbe.c - 664 sys sys 1201822310 45935
+1201822204 1 c sys/src/boot/pc/etherigbe.c - 664 sys sys 1201822335 41718

sys/man/8/aquarela

@@ -5,18 +5,15 @@ aquarela \- CIFS server
 .B aquarela
 [
 .B -np
-]
-[
+] [
 .B -d
 .I debug
-]
-[
+] [
 .B -u
 .I N
-]
-[
+] [
 .B -w
-.I workgroup 
+.I workgroup
 ]
 .SH DESCRIPTION
 .I Aquarela
@@ -28,11 +25,12 @@ provides
 access to Plan 9 file servers.
 It announces and subsequently listens on
 .B tcp!*!445
-for connections to the individual file hierarchies called ``shares'' by
+for connections to the file hierarchies called `shares' by
 .SM CIFS\c .
-Users are authenticated with their Inferno/\c
-.SM POP
-password.
+Users are authenticated with their
+.SM APOP
+secret (see
+.IR auth (8)).
 Each session is managed by a process running as the authenticated user.
 Two persistent processes handle listening, session setup, and housekeeping.
 .PP
@@ -45,23 +43,46 @@ A client request for a specific share, say,
 .BR share ,
 causes
 .I aquarela
-to serve
-.B /n/share.
-If that path is not already a mountpoint, a
-.IR 9fs (4)
+to attempt a
+.I 9fs
+(in
+.IR srv (4))
 connection to the file server
-.B share
-is attempted.
+.BR share .
 If connection succeeds, a file hierarchy rooted at
 .B /n/share
-is finally presented to the client.
+is presented to the client.
 The client request fails otherwise.
 Requests for the protocol equivalent of
 .B /
-are satisfied with a one-level directory containing only the default share,
-.BR local.
+are satisfied with a directory containing only the default share,
+.BR local .
 .PP
 The options are:
+.TF "-u "
+.TP
+.B -n
+Enable limited
+.SM NETBIOS
+service.
+.I Aquarela
+will register with the `master browser' for
+.I workgroup
+and listen on
+.B tcp!*!139
+and
+.B udp!*!13[7-9]
+for
+.SM NETBIOS
+name resolution and session requests.
+This works in tandem with a complete
+.SM NETBIOS
+master name server, like that provided by Unix
+\fInmbd\fR(8).
+.SM NETBIOS
+is not required for
+.SM CIFS
+file service.
 .TP
 .BI -u " N
 Send Unicode.
@@ -83,53 +104,31 @@ is
 .BI -w " workgroup
 Set
 .I workgroup
-(or ``primary domain'') of server.
+(or `primary domain') of server.
 Default
 .BR PLAN9 .
-.TP
-.B -n
-Enable limited
-.SM NETBIOS
-service.
-.I Aquarela
-will register with the ``master browser'' for
-.I workgroup
-and listen on
-.B tcp!*!139
-for name resolution queries.
-This works only in tandem with a complete
-.SM NETBIOS
-master name server, like that provided by
-.SM UNIX
-.IR nmbd (8).
-.SM NETBIOS
-is not required for
-.SM CIFS
-file service.
 .PD
 .SH EXAMPLE
-To start a
+To start
 .SM CIFS
-server on system
-.B plan9
-as a member of
-.BR WORKGROUP :
+service on system
+.BR plan9 :
 .IP
 .EX
-aquarela -u 1 -w WORKGROUP &
+% aquarela -u 1 &
 .EE
 .PP
-To make 
-.BR plan9 's 
+To then make the
 .B dump
 filesystem available as drive
 .B Y:
 on a Windows machine:
 .IP
 .EX
-net use Y: \\\\plan9.example.com\\dump
+C:\\>net use Y: \\\\plan9.example.com\\dump
 .EE
 .SH FILES
+.TF /sys/log/aquarela
 .TP
 .B /n/local
 Default
@@ -137,13 +136,14 @@ Default
 share
 .TP
 .B /sys/log/aquarela
-Log file, if it exists
+Log file
 .PD
 .SH SOURCE
 .B /sys/src/cmd/aquarela
 .SH SEE ALSO
-.IR 9fs (4),
-.IR UTF (6)
+.IR auth (8),
+.IR srv (4),
+.IR utf (6)
 .SH DIAGNOSTICS
 Log messages are appended to
 .B /sys/log/aquarela
@@ -177,7 +177,7 @@ Creation and deletion of file ids.
 .SM RAP
 calls.
 .TP
-.B find 
+.B find
 Transaction2 find commands.
 .TP
 .B query
@@ -186,7 +186,7 @@ Transaction2 query commands.
 .B sharedfiles
 All files opened.
 .TP
-.B poolparanoia 
+.B poolparanoia
 Draconian error checking in memory allocator.
 .TP
 .B sessions
@@ -209,18 +209,17 @@ sub-requests
 or
 .BR SMB_TRANS2_FIND_FIRST2 )
 matching symbolic name
-.I any-smb-name. 
+.I any-smb-name.
 .TP
 .BI 0x nn
-Debug only messages with this hexadecimal id.
+Debug only messages with hexadecimal id
+.BI 0x nn.
 .PD
 .SH BUGS
-The first login attempt from a given Windows login session often fails erroneously - try again.
-The server disk space reported by some clients is inaccurate.
+The first connection attempt to a share sometimes fails erroneously - try again.
+The share disk space reported by some clients is inaccurate.
 Some clients can't rename directories.
 Write attempts without sufficient permissions fail (correctly), but appear on client to temporarily succeed.
 .PP
-The multitude of diagnostics both in the program and in this manual page reflect the in-progress nature of the code.
-.PP
 This program should probably be named
 .IR cifsserver .

sys/src/9/pc/etherigbe.c

@@ -35,6 +35,7 @@ enum {
 	i82547ei	= (0x1019<<16)|0x8086,
 	i82540em	= (0x100E<<16)|0x8086,
 	i82540eplp	= (0x101E<<16)|0x8086,
+	i82545em	= (0x100F<<16)|0x8086,
 	i82545gmc	= (0x1026<<16)|0x8086,
 	i82547gi	= (0x1075<<16)|0x8086,
 	i82541gi	= (0x1076<<16)|0x8086,
@@ -901,6 +902,7 @@ igbetxinit(Ctlr* ctlr)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -938,6 +940,7 @@ igbetxinit(Ctlr* ctlr)
 	case i82540em:
 	case i82540eplp:
 	case i82547gi:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -1076,6 +1079,7 @@ igberxinit(Ctlr* ctlr)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -1474,6 +1478,7 @@ igbemii(Ctlr* ctlr)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -1508,6 +1513,7 @@ igbemii(Ctlr* ctlr)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -1641,6 +1647,7 @@ at93c46r(Ctlr* ctlr)
 	case i82540eplp:
 	case i82541pi:
 	case i82541gi2:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -1728,6 +1735,7 @@ igbedetach(Ctlr* ctlr)
 	case i82541pi:
 	case i82547gi:
 	case i82541gi2:
+	case i82545em:
 	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
@@ -1909,6 +1917,7 @@ igbepci(void)
 		case i82547gi:
 		case i82541gi2:
 		case i82541pi:
+		case i82545em:
 		case i82545gmc:
 		case i82546gb:
 		case i82546eb:

sys/src/boot/pc/etherigbe.c

@@ -34,18 +34,20 @@ enum {
 	Debug = 0,		/* mostly for X60 debugging */
 };
 enum {
-	i82542     = (0x1000<<16)|0x8086,
-	i82543gc   = (0x1004<<16)|0x8086,
-	i82544ei   = (0x1008<<16)|0x8086,
-	i82540em   = (0x100E<<16)|0x8086,
-	i82546eb   = (0x1010<<16)|0x8086,
-	i82547ei   = (0x1019<<16)|0x8086,
-	i82540eplp = (0x101E<<16)|0x8086,
-	i82547gi   = (0x1075<<16)|0x8086,
-	i82541gi   = (0x1076<<16)|0x8086,
-	i82541gi2  = (0x1077<<16)|0x8086,
-	i82546gb   = (0x1079<<16)|0x8086,
-	i82541pi   = (0x107c<<16)|0x8086,
+	i82542		= (0x1000<<16)|0x8086,
+	i82543gc	= (0x1004<<16)|0x8086,
+	i82544ei	= (0x1008<<16)|0x8086,
+	i82547ei	= (0x1019<<16)|0x8086,
+	i82540em	= (0x100E<<16)|0x8086,
+	i82540eplp	= (0x101E<<16)|0x8086,
+	i82545em	= (0x100F<<16)|0x8086,
+	i82545gmc	= (0x1026<<16)|0x8086,
+	i82547gi	= (0x1075<<16)|0x8086,
+	i82541gi	= (0x1076<<16)|0x8086,
+	i82541gi2	= (0x1077<<16)|0x8086,
+	i82546gb	= (0x1079<<16)|0x8086,
+	i82541pi	= (0x107c<<16)|0x8086,
+	i82546eb	= (0x1010<<16)|0x8086,
 };
 
 /* compatibility with cpu kernels */
@@ -858,6 +860,8 @@ igbeinit(Ether* edev)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
+	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
 	case i82547gi:
@@ -904,6 +908,8 @@ igbeinit(Ether* edev)
 	case i82546gb:
 	case i82546eb:
 	case i82547gi:
+	case i82545em:
+	case i82545gmc:
 		r = 8;
 		break;
 	}
@@ -939,6 +945,8 @@ igbeinit(Ether* edev)
 	case i82540eplp:
 	case i82547gi:
 	case i82541pi:
+	case i82545em:
+	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
 	case i82541gi:
@@ -1173,6 +1181,8 @@ igbemii(Ctlr* ctlr)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
+	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
 		ctrl &= ~(Frcdplx|Frcspd);
@@ -1210,6 +1220,8 @@ igbemii(Ctlr* ctlr)
 	case i82541gi:
 	case i82541gi2:
 	case i82541pi:
+	case i82545em:
+	case i82545gmc:
 	case i82546gb:
 	case i82546eb:
 		break;
@@ -1340,6 +1352,8 @@ at93c46r(Ctlr* ctlr)
 	case i82540eplp:
 	case i82541gi:
 	case i82541gi2:
+	case i82545em:
+	case i82545gmc:
 	case i82541pi:
 	case i82547gi:
 	case i82546gb:
@@ -1422,6 +1436,8 @@ detach(Ctlr *ctlr)
 	case i82540eplp:
 	case i82541gi:
 	case i82541gi2:
+	case i82545em:
+	case i82545gmc:
 	case i82541pi:
 	case i82547gi:
 	case i82546gb:
@@ -1617,6 +1633,8 @@ igbepci(void)
 		case i82541gi:
 		case i82541gi2:
 		case i82541pi:
+		case i82545em:
+		case i82545gmc:
 		case i82546gb:
 		case i82546eb:
 			break;