Check if e1000 init happened before calling e1000*

4f9c36a7 · Silas Boyd-Wickizer · 10285b77 · 4f9c36a7 · 4f9c36a7 · 4f9c36a7
--- a/e1000.c
+++ b/e1000.c
@@ -9,6 +9,7 @@
 #define RX_RING_SIZE 64

 int e1000irq;
+int e1000init;

 static struct {
  u32 membase;
@@ -296,5 +297,6 @@ e1000attach(struct pci_func *pcif)
  for (i = 0; i < WMREG_MTA; i+=4)
    ewr(WMREG_CORDOVA_MTA+i, 0);

+  e1000init = 1;
  return 0;
 }
--- a/kernel.h
+++ b/kernel.h
@@ -76,6 +76,7 @@ void crange_print(struct crange *cr, int);

 // e1000.c
 extern int e1000irq;
+extern int e1000init;
 void            e1000intr(void);
 int             e1000tx(void *buf, u32 len);
 void            e1000hwaddr(u8 *hwaddr);

--- a/net.c
+++ b/net.c
@@ -37,12 +37,16 @@ netalloc(void)
 int
 nettx(void *va, u16 len)
 {
+  if (e1000init == 0)
+    return -1;
  return e1000tx(va, len);
 }

 void
 nethwaddr(u8 *hwaddr)
 {
+  if (e1000init == 0)
+    return;
  e1000hwaddr(hwaddr);
 }