Changeset 3bacee1 in mainline for uspace/lib/nic/src/nic_rx_control.c

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

File:

• uspace/lib/nic/src/nic_rx_control.c (modified) (14 diffs)

uspace/lib/nic/src/nic_rx_control.c

@@ -145 +145 @@
  */
 void nic_rxc_unicast_get_mode(const nic_rxc_t *rxc, nic_unicast_mode_t *mode,
-        size_t max_count, nic_address_t *address_list, size_t *address_count)
+    size_t max_count, nic_address_t *address_list, size_t *address_count)
 {
         *mode = rxc->unicast_mode;
@@ -174 +174 @@
  */
 errno_t nic_rxc_unicast_set_mode(nic_rxc_t *rxc, nic_unicast_mode_t mode,
-        const nic_address_t *address_list, size_t address_count)
+    const nic_address_t *address_list, size_t address_count)
 {
         if (mode == NIC_UNICAST_LIST && address_list == NULL) {
@@ -189 +189 @@
         for (i = 0; i < address_count; ++i) {
                 errno_t rc = nic_addr_db_insert(&rxc->unicast_addrs,
-                        (const uint8_t *) &address_list[i].address);
+                    (const uint8_t *) &address_list[i].address);
                 if (rc == ENOMEM) {
                         return ENOMEM;
@@ -208 +208 @@
  */
 void nic_rxc_multicast_get_mode(const nic_rxc_t *rxc,
-        nic_multicast_mode_t *mode, size_t max_count, nic_address_t *address_list,
-        size_t *address_count)
+    nic_multicast_mode_t *mode, size_t max_count, nic_address_t *address_list,
+    size_t *address_count)
 {
         *mode = rxc->multicast_mode;
@@ -238 +238 @@
  */
 errno_t nic_rxc_multicast_set_mode(nic_rxc_t *rxc, nic_multicast_mode_t mode,
-        const nic_address_t *address_list, size_t address_count)
+    const nic_address_t *address_list, size_t address_count)
 {
         if (mode == NIC_MULTICAST_LIST && address_list == NULL)
@@ -252 +252 @@
         for (i = 0; i < address_count; ++i) {
                 errno_t rc = nic_addr_db_insert(&rxc->multicast_addrs,
-                        (const uint8_t *)&address_list[i].address);
+                    (const uint8_t *)&address_list[i].address);
                 if (rc == ENOMEM) {
                         return ENOMEM;
@@ -295 +295 @@
  */
 void nic_rxc_blocked_sources_get(const nic_rxc_t *rxc,
-        size_t max_count, nic_address_t *address_list, size_t *address_count)
+    size_t max_count, nic_address_t *address_list, size_t *address_count)
 {
         nic_rxc_add_addr_t hs = {
@@ -321 +321 @@
  */
 errno_t nic_rxc_blocked_sources_set(nic_rxc_t *rxc,
-        const nic_address_t *address_list, size_t address_count)
-{
-        assert((address_count == 0 && address_list == NULL)
-                || (address_count != 0 && address_list != NULL));
+    const nic_address_t *address_list, size_t address_count)
+{
+        assert((address_count == 0 && address_list == NULL) ||
+            (address_count != 0 && address_list != NULL));
 
         nic_addr_db_clear(&rxc->blocked_sources);
@@ -331 +331 @@
         for (i = 0; i < address_count; ++i) {
                 errno_t rc = nic_addr_db_insert(&rxc->blocked_sources,
-                        (const uint8_t *) &address_list[i].address);
+                    (const uint8_t *) &address_list[i].address);
                 if (rc == ENOMEM) {
                         return ENOMEM;
@@ -395 +395 @@
  */
 bool nic_rxc_check(const nic_rxc_t *rxc, const void *data, size_t size,
-        nic_frame_type_t *frame_type)
+    nic_frame_type_t *frame_type)
 {
         assert(frame_type != NULL);
@@ -449 +449 @@
         if (!rxc->vlan_exact && rxc->vlan_mask != NULL) {
                 vlan_header_t *vlan_header = (vlan_header_t *)
-                        ((uint8_t *) data + 2 * ETH_ADDR);
+                    ((uint8_t *) data + 2 * ETH_ADDR);
                 if (vlan_header->tpid_upper == VLAN_TPID_UPPER &&
-                        vlan_header->tpid_lower == VLAN_TPID_LOWER) {
+                    vlan_header->tpid_lower == VLAN_TPID_LOWER) {
                         int index = ((int) (vlan_header->vid_upper & 0xF) << 5) |
                             (vlan_header->vid_lower >> 3);
@@ -476 +476 @@
  */
 void nic_rxc_hw_filtering(nic_rxc_t *rxc,
-        int unicast_exact, int multicast_exact, int vlan_exact)
+    int unicast_exact, int multicast_exact, int vlan_exact)
 {
         if (unicast_exact >= 0)
@@ -505 +505 @@
 {
         uint32_t crc;
-    int carry, i, j;
-    uint8_t b;
-
-    crc = 0xffffffff;
-    for (i = 0; i < 6; i++) {
-        b = addr[i];
-        for (j = 0; j < 8; j++) {
-            carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
-            crc <<= 1;
-            b >>= 1;
-            if (carry)
-                crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry);
-        }
-    }
-
-    uint64_t one64 = 1;
-    return one64 << (crc >> 26);
+        int carry, i, j;
+        uint8_t b;
+
+        crc = 0xffffffff;
+        for (i = 0; i < 6; i++) {
+                b = addr[i];
+                for (j = 0; j < 8; j++) {
+                        carry = ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01);
+                        crc <<= 1;
+                        b >>= 1;
+                        if (carry)
+                                crc = ((crc ^ CRC_MCAST_POLYNOMIAL) | carry);
+                }
+        }
+
+        uint64_t one64 = 1;
+        return one64 << (crc >> 26);
 }
 
@@ -571 +571 @@
                 break;
         case NIC_MULTICAST_PROMISC:
-                return ~ (uint64_t) 0;
+                return ~(uint64_t) 0;
         }
         uint64_t hash;