diff --git a/src/kits/network/libnetapi/NetworkAddress.cpp b/src/kits/network/libnetapi/NetworkAddress.cpp
index 7996532c92..2a7469e3d7 100644
--- a/src/kits/network/libnetapi/NetworkAddress.cpp
+++ b/src/kits/network/libnetapi/NetworkAddress.cpp
@@ -1117,6 +1117,17 @@ BNetworkAddress::operator<(const BNetworkAddress& other) const
 				sizeof(address.sin6_addr));
 			break;
 		}
+
+		case AF_LINK:
+			if (LinkLevelAddressLength() < other.LinkLevelAddressLength())
+				return true;
+			if (LinkLevelAddressLength() > other.LinkLevelAddressLength())
+				return true;
+
+			// TODO: could compare index, and name, too
+			compare = memcmp(LinkLevelAddress(), other.LinkLevelAddress(),
+				LinkLevelAddressLength());
+			break;
 	}
 
 	if (compare < 0)
diff --git a/src/kits/network/libnetapi/NetworkDevice.cpp b/src/kits/network/libnetapi/NetworkDevice.cpp
index 87fccd4580..827ee06732 100644
--- a/src/kits/network/libnetapi/NetworkDevice.cpp
+++ b/src/kits/network/libnetapi/NetworkDevice.cpp
@@ -64,43 +64,6 @@ get_80211(const char* name, int32 type, void* data, int32& length)
 }
 
 
-#if 0
-static status_t
-set_80211(const char* name, int32 type, void* data,
-	int32 length = 0, int32 value = 0)
-{
-	int socket = ::socket(AF_INET, SOCK_DGRAM, 0);
-	if (socket < 0)
-		return errno;
-
-	FileDescriptorCloser closer(socket);
-
-	struct ieee80211req ireq;
-	strlcpy(ireq.i_name, name, IF_NAMESIZE);
-	ireq.i_type = type;
-	ireq.i_val = value;
-	ireq.i_len = length;
-	ireq.i_data = data;
-
-	if (ioctl(socket, SIOCS80211, &ireq, sizeof(struct ieee80211req)) < 0)
-		return errno;
-
-	return B_OK;
-}
-
-
-template<typename T> status_t
-set_80211(const char* name, int32 type, T& data, int32 length = 0,
-	int32 value = 0)
-{
-	if (length == 0)
-		length = sizeof(T);
-
-	return set_80211(name, &data, length, value);
-}
-#endif
-
-
 template<typename T> status_t
 do_request(T& request, const char* name, int option)
 {