Changeset 8a9a41e in mainline for uspace/lib/drv/generic/remote_ieee80211.c

Timestamp:

2021-10-24T08:28:43Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/lib/drv/generic/remote_ieee80211.c (modified) (7 diffs)

uspace/lib/drv/generic/remote_ieee80211.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2015 Jan Kolarik
  * All rights reserved.
@@ -84 +85 @@
 }
 
-static bool mac_matches(uint8_t *mac1, uint8_t *mac2)
-{
-        for (size_t i = 0; i < ETH_ADDR; i++) {
-                if (mac1[i] != mac2[i])
-                        return false;
-        }
-
-        return true;
-}
-
+// XXX This is wrong. Wifi should not have anything to do with IP links
 static sysarg_t get_link_id(uint8_t *mac)
 {
         sysarg_t *link_list;
         inet_link_info_t link_info;
+        eth_addr_t eth_addr;
         size_t count;
+
+        eth_addr_decode(mac, &eth_addr);
 
         errno_t rc = inetcfg_get_link_list(&link_list, &count);
@@ -109 +104 @@
                         return -1;
 
-                if (mac_matches(mac, link_info.mac_addr))
+                if (eth_addr_compare(&eth_addr, &link_info.mac_addr) == 0)
                         return link_list[i];
         }
@@ -170 +165 @@
                 return rc;
 
+        // XXX This is wrong. Wifi should not initiate DHCP
+
         /* Send DHCP discover. */
         nic_address_t wifi_mac;
@@ -207 +204 @@
         if (rc != EOK)
                 return rc;
+
+        eth_addr_t eth_addr;
+        eth_addr_decode(wifi_mac.address, &eth_addr);
 
         inet_link_info_t link_info;
@@ -215 +215 @@
         size_t count;
 
+        /// XXX This is wrong. Wifi should do nothing with DHCP
+
         /* Remove previous DHCP address. */
         rc = inetcfg_get_addr_list(&addr_list, &count);
@@ -229 +231 @@
                         return rc;
 
-                if (mac_matches(wifi_mac.address, link_info.mac_addr)) {
+                if (eth_addr_compare(&eth_addr, &link_info.mac_addr) == 0) {
                         if (str_test_prefix(addr_info.name, "dhcp")) {
                                 rc = inetcfg_addr_delete(addr_list[i]);