diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index a166db50fc..094f558654 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -681,7 +681,40 @@ rule ArchitectureSetupWarnings architecture
 	EnableWerror src add-ons kernel drivers joystick ;
 	EnableWerror src add-ons kernel drivers midi ;
 	EnableWerror src add-ons kernel drivers misc ;
-#	EnableWerror src add-ons kernel drivers network ;
+	EnableWerror src add-ons kernel drivers network ether 3com ;
+#	EnableWerror src add-ons kernel drivers network ether atheros813x ;
+#	EnableWerror src add-ons kernel drivers network ether atheros81xx ;
+#	EnableWerror src add-ons kernel drivers network ether attansic_l1 ;
+#	EnableWerror src add-ons kernel drivers network ether attansic_l2 ;
+#	EnableWerror src add-ons kernel drivers network ether broadcom440x ;
+#	EnableWerror src add-ons kernel drivers network ether broadcom570x ;
+#	EnableWerror src add-ons kernel drivers network ether dec21xxx ;
+	EnableWerror src add-ons kernel drivers network ether etherpci ;
+#	EnableWerror src add-ons kernel drivers network ether intel22x ;
+#	EnableWerror src add-ons kernel drivers network ether ipro100 ;
+#	EnableWerror src add-ons kernel drivers network ether ipro1000 ;
+#	EnableWerror src add-ons kernel drivers network ether jmicron2x0 ;
+#	EnableWerror src add-ons kernel drivers network ether marvell_yukon ;
+#	EnableWerror src add-ons kernel drivers network ether nforce ;
+#	EnableWerror src add-ons kernel drivers network ether pcnet ;
+	EnableWerror src add-ons kernel drivers network ether pegasus ;
+	EnableWerror src add-ons kernel drivers network ether rdc ;
+#	EnableWerror src add-ons kernel drivers network ether rtl8139 ;
+#	EnableWerror src add-ons kernel drivers network ether rtl81xx ;
+	EnableWerror src add-ons kernel drivers network ether sis19x ;
+#	EnableWerror src add-ons kernel drivers network ether sis900 ;
+#	EnableWerror src add-ons kernel drivers network ether syskonnect ;
+	EnableWerror src add-ons kernel drivers network ether usb_asix ;
+	EnableWerror src add-ons kernel drivers network ether usb_davicom ;
+	EnableWerror src add-ons kernel drivers network ether usb_ecm ;
+	EnableWerror src add-ons kernel drivers network ether usb_rndis ;
+	EnableWerror src add-ons kernel drivers network ether via_rhine ;
+	EnableWerror src add-ons kernel drivers network ether virtio ;
+#	EnableWerror src add-ons kernel drivers network ether vt612x ;
+	EnableWerror src add-ons kernel drivers network ether wb840 ;
+	EnableWerror src add-ons kernel drivers network tun ;
+#	EnableWerror src add-ons kernel drivers network wlan ;
+	EnableWerror src add-ons kernel drivers network wwan ;
 	EnableWerror src add-ons kernel drivers ports ;
 	EnableWerror src add-ons kernel drivers power ;
 	EnableWerror src add-ons kernel drivers printer ;
diff --git a/src/add-ons/kernel/drivers/network/ether/etherpci/etherpci.c b/src/add-ons/kernel/drivers/network/ether/etherpci/etherpci.c
index 8f4fbc8b06..e35e3e0bb9 100644
--- a/src/add-ons/kernel/drivers/network/ether/etherpci/etherpci.c
+++ b/src/add-ons/kernel/drivers/network/ether/etherpci/etherpci.c
@@ -552,7 +552,7 @@ static void
 etherpci_min(etherpci_private_t *data, unsigned char *dst,
 	unsigned src, unsigned len)
 {
-	int i;
+	unsigned int i;
 
 	if (len & 1)
 		len++;
@@ -584,7 +584,7 @@ static void
 etherpci_mout(etherpci_private_t *data, unsigned dst,
 	const unsigned char *src, unsigned len)
 {
-	int i;
+	unsigned int i;
 	int tries = 1;
 
 	// This loop is for a bug that showed up with the old ISA 3com cards
@@ -688,7 +688,7 @@ ringzero(etherpci_private_t *data, unsigned boundary,
 static int
 probe(etherpci_private_t *data)
 {
-	int i;
+	unsigned int i;
 	int reg;
 	unsigned char test[EC_PAGE_SIZE];
 	short waddr[ETHER_ADDR_LEN];
@@ -1160,7 +1160,7 @@ copy_packet(etherpci_private_t *data, unsigned char *ether_buf,
 static int
 my_packet(etherpci_private_t *data, char *addr)
 {
-	int i;
+	unsigned int i;
 	const char broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
 	if (memcmp(addr, &data->myaddr, sizeof(data->myaddr)) == 0
diff --git a/src/add-ons/kernel/drivers/network/ether/pegasus/driver.c b/src/add-ons/kernel/drivers/network/ether/pegasus/driver.c
index c73a57bd0b..492902869a 100644
--- a/src/add-ons/kernel/drivers/network/ether/pegasus/driver.c
+++ b/src/add-ons/kernel/drivers/network/ether/pegasus/driver.c
@@ -268,7 +268,7 @@ remove_device(pegasus_dev *device)
 static status_t
 setup_endpoints(const usb_interface_info *uii, pegasus_dev *dev)
 {
-	size_t epts[3] = { -1, -1, -1 };
+	ssize_t epts[3] = { -1, -1, -1 };
 	size_t ep = 0;
 	for(; ep < uii->endpoint_count; ep++){
 		usb_endpoint_descriptor *ed = uii->endpoint[ep].descr;
@@ -347,7 +347,7 @@ pegasus_device_added(const usb_device dev, void **cookie)
 	const usb_interface_info *intf;
 	status_t status;
 	uint16 ifno;
-	int i;
+	unsigned int i;
 
 	ASSERT(dev != 0 && cookie != NULL);
 	DPRINTF_INFO("device_added()\n");
diff --git a/src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sge.c b/src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sge.c
index ec545c9a49..82b2539834 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sge.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis19x/dev/sge/if_sge.c
@@ -91,6 +91,10 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/sge/if_sgereg.h>
 
+#if defined(__HAIKU__)
+#include "../../glue.h"
+#endif
+
 MODULE_DEPEND(sge, pci, 1, 1, 1);
 MODULE_DEPEND(sge, ether, 1, 1, 1);
 MODULE_DEPEND(sge, miibus, 1, 1, 1);
diff --git a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
index b566fc4b59..626c43f5ce 100644
--- a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
+++ b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.c
@@ -19,6 +19,8 @@
 #include <dev/pci/pcivar.h>
 #include <dev/sge/if_sgereg.h>
 
+#include "glue.h"
+
 
 HAIKU_FBSD_DRIVER_GLUE(sis19x, sge, pci);
 HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE);
diff --git a/src/add-ons/kernel/drivers/network/ether/sis19x/glue.h b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.h
new file mode 100644
index 0000000000..75ee911e4f
--- /dev/null
+++ b/src/add-ons/kernel/drivers/network/ether/sis19x/glue.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2009 S.Zharski <imker@gmx.li>
+ * Copyright 2018, Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+
+#ifndef GLUE_H
+#define GLUE_H
+
+
+int haiku_sge_get_mac_addr_apc(device_t dev, uint8_t* dest, int* rgmii);
+
+
+#endif /* !GLUE_H */
diff --git a/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.cpp b/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.cpp
index 4f43550461..25fa50f549 100644
--- a/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.cpp
+++ b/src/add-ons/kernel/drivers/network/ether/usb_asix/ASIXDevice.cpp
@@ -228,7 +228,7 @@ ASIXDevice::Read(uint8 *buffer, size_t *numBytes)
 
 		// the device pushes packets 16bit aligned
 		if (fActualLengthRead - sizeof(TRXHeader) > header.Length()
-				+ (header.Length() % 2)) {
+				+ (header.Length() % 2u)) {
 			TRACE_ALWAYS("MISMATCH of the frame length: hdr %d; received:%d\n",
 				header.Length(), fActualLengthRead - sizeof(TRXHeader));
 		} else if (fActualLengthRead - sizeof(TRXHeader) < header.Length()) {
diff --git a/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp
index c88831195a..c3d9e08c89 100644
--- a/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp
+++ b/src/add-ons/kernel/drivers/network/ether/usb_ecm/Driver.cpp
@@ -142,7 +142,7 @@ uninit_driver()
 	mutex_lock(&gDriverLock);
 
 	for (int32 i = 0; i < MAX_DEVICES; i++) {
-		if (gECMDevices[i]) {
+		if (gECMDevices[i] != NULL) {
 			delete gECMDevices[i];
 			gECMDevices[i] = NULL;
 		}
@@ -167,9 +167,10 @@ usb_ecm_open(const char *name, uint32 flags, void **cookie)
 	*cookie = NULL;
 	status_t status = ENODEV;
 	int32 index = strtol(name + strlen(sDeviceBaseName), NULL, 10);
-	if (index >= 0 && index < MAX_DEVICES && gECMDevices[index]) {
+	if (index >= 0 && index < MAX_DEVICES && gECMDevices[index] != NULL) {
 		status = gECMDevices[index]->Open();
-		*cookie = gECMDevices[index];
+		if (status == B_OK)
+			*cookie = gECMDevices[index];
 	}
 
 	mutex_unlock(&gDriverLock);
@@ -252,7 +253,7 @@ publish_devices()
 			continue;
 
 		gDeviceNames[deviceCount] = (char *)malloc(strlen(sDeviceBaseName) + 4);
-		if (gDeviceNames[deviceCount]) {
+		if (gDeviceNames[deviceCount] != NULL) {
 			sprintf(gDeviceNames[deviceCount], "%s%" B_PRId32, sDeviceBaseName,
 				i);
 			TRACE("publishing %s\n", gDeviceNames[deviceCount]);
diff --git a/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vr.c b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vr.c
index 688c92f3a9..ff0942f32e 100644
--- a/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vr.c
+++ b/src/add-ons/kernel/drivers/network/ether/via_rhine/dev/vr/if_vr.c
@@ -1263,7 +1263,7 @@ static __inline void
 vr_fixup_rx(struct mbuf *m)
 {
         uint16_t		*src, *dst;
-        int			i;
+        unsigned int			i;
 
 	src = mtod(m, uint16_t *);
 	dst = src - 1;
diff --git a/src/add-ons/kernel/drivers/network/ether/wb840/interface.c b/src/add-ons/kernel/drivers/network/ether/wb840/interface.c
index 514195bc73..340ca0574d 100644
--- a/src/add-ons/kernel/drivers/network/ether/wb840/interface.c
+++ b/src/add-ons/kernel/drivers/network/ether/wb840/interface.c
@@ -78,10 +78,10 @@ mii_send(wb_device *device, uint32 bits, int count)
 	SIO_CLR(WB_SIO_MII_CLK);
 
 	for (i = (0x1 << (count - 1)); i; i >>= 1) {
-    	if (bits & i)
+		if (bits & i)
 			SIO_SET(WB_SIO_MII_DATAIN);
-        else
-        	SIO_CLR(WB_SIO_MII_DATAIN);
+		else
+			SIO_CLR(WB_SIO_MII_DATAIN);
 		MII_DELAY(device);
 		SIO_CLR(WB_SIO_MII_CLK);
 		MII_DELAY(device);