Changes in uspace/lib/nic/src/nic_rx_control.c [cf9cb36:00d7e1b] in mainline

File:

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

uspace/lib/nic/src/nic_rx_control.c

@@ -40 +40 @@
 #include <bool.h>
 #include <errno.h>
-#include <mem.h>
-#include <nic/nic.h>
+#include <net/device.h>
+#include <net_checksum.h>
+#include <packet_client.h>
 #include "nic_rx_control.h"
 
@@ -391 +392 @@
  *
  * @param rxc
- * @param frame     The probed frame
+ * @param packet        The probed frame
  *
  * @return True if the frame passes, false if it does not
  */
-int nic_rxc_check(const nic_rxc_t *rxc, const void *data, size_t size,
+int nic_rxc_check(const nic_rxc_t *rxc, const packet_t *packet,
         nic_frame_type_t *frame_type)
 {
         assert(frame_type != NULL);
-        uint8_t *dest_addr = (uint8_t *) data;
+        uint8_t *dest_addr = (uint8_t *) packet + packet->data_start;
         uint8_t *src_addr = dest_addr + ETH_ADDR;
-
-        if (size < 2 * ETH_ADDR)
-                return false;
 
         if (dest_addr[0] & 1) {
@@ -440 +438 @@
                 }
         }
-        
         /* Blocked source addresses */
         if (rxc->block_sources) {
@@ -446 +443 @@
                         return false;
         }
-        
         /* VLAN filtering */
         if (!rxc->vlan_exact && rxc->vlan_mask != NULL) {
                 vlan_header_t *vlan_header = (vlan_header_t *)
-                        ((uint8_t *) data + 2 * ETH_ADDR);
+                        ((uint8_t *) packet + packet->data_start + 2 * ETH_ADDR);
                 if (vlan_header->tpid_upper == VLAN_TPID_UPPER &&
                         vlan_header->tpid_lower == VLAN_TPID_LOWER) {
@@ -486 +482 @@
                 rxc->vlan_exact = vlan_exact;
 }
-
-/** Polynomial used in multicast address hashing */
-#define CRC_MCAST_POLYNOMIAL  0x04c11db6
-
-/** Compute the standard hash from MAC
- *
- * Hashing MAC into 64 possible values and using the value as index to
- * 64bit number.
- *
- * The code is copied from qemu-0.13's implementation of ne2000 and rt8139
- * drivers, but according to documentation there it originates in FreeBSD.
- *
- * @param[in] addr The 6-byte MAC address to be hashed
- *
- * @return 64-bit number with only single bit set to 1
- *
- */
-static uint64_t multicast_hash(const uint8_t addr[6])
-{
-        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);
-}
-
 
 /**