Changeset 6843a9c in mainline for uspace/lib/nic/include/nic_rx_control.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/lib/nic/include/nic_rx_control.h (modified) (2 diffs)

uspace/lib/nic/include/nic_rx_control.h

@@ -45 +45 @@
 #include <adt/hash_table.h>
 #include <fibril_synch.h>
-#include <net/device.h>
-#include <net/packet_header.h>
+#include <nic/nic.h>
 
 #include "nic_addr_db.h"
@@ -120 +119 @@
         const nic_address_t *prev_addr, const nic_address_t *curr_addr);
 extern int nic_rxc_check(const nic_rxc_t *rxc,
-        const packet_t *packet, nic_frame_type_t *frame_type);
+        const void *data, size_t size, nic_frame_type_t *frame_type);
 extern void nic_rxc_hw_filtering(nic_rxc_t *rxc,
         int unicast_exact, int multicast_exact, int vlan_exact);