Changeset 1bc35b5 in mainline for uspace/lib/nic/src/nic_rx_control.c

Timestamp:

2012-01-19T08:13:45Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8da56b

Parents:

3ea725e

Message:

Remove most use of packet_t from NIC drivers.

File:

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

uspace/lib/nic/src/nic_rx_control.c

@@ -392 +392 @@
  *
  * @param rxc
- * @param packet        The probed frame
+ * @param frame     The probed frame
  *
  * @return True if the frame passes, false if it does not
  */
-int nic_rxc_check(const nic_rxc_t *rxc, const packet_t *packet,
+int nic_rxc_check(const nic_rxc_t *rxc, const void *data, size_t size,
         nic_frame_type_t *frame_type)
 {
         assert(frame_type != NULL);
-        uint8_t *dest_addr = (uint8_t *) packet + packet->data_start;
+        uint8_t *dest_addr = (uint8_t *) data;
         uint8_t *src_addr = dest_addr + ETH_ADDR;
+
+        if (size < 2 * ETH_ADDR)
+                return false;
 
         if (dest_addr[0] & 1) {
@@ -448 +451 @@
         if (!rxc->vlan_exact && rxc->vlan_mask != NULL) {
                 vlan_header_t *vlan_header = (vlan_header_t *)
-                        ((uint8_t *) packet + packet->data_start + 2 * ETH_ADDR);
+                        ((uint8_t *) data + 2 * ETH_ADDR);
                 if (vlan_header->tpid_upper == VLAN_TPID_UPPER &&
                         vlan_header->tpid_lower == VLAN_TPID_LOWER) {