summaryrefslogtreecommitdiff
path: root/cesar/cl/src
diff options
context:
space:
mode:
authorlaranjeiro2009-09-24 11:05:14 +0000
committerlaranjeiro2009-09-24 11:05:14 +0000
commit972cf498d0741b485a5ea5a05c75b535d70a3b6c (patch)
tree07d7f2bf05329437f73e46788ce4f3fc6344e5ce /cesar/cl/src
parentb01f396c908996b07b57f51831b1959fe82841e7 (diff)
*cl:
* Remove a useless logical mask. * Replace some addition by the real capability of the bitstream function. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@5730 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/cl/src')
-rw-r--r--cesar/cl/src/cl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cesar/cl/src/cl.c b/cesar/cl/src/cl.c
index eb254399f7..79be926f9f 100644
--- a/cesar/cl/src/cl.c
+++ b/cesar/cl/src/cl.c
@@ -254,7 +254,7 @@ void cl_send (cl_t *ctx, u8 *buffer, uint length, uint tag, bool mme,
mac = bitstream_direct_read_large (buffer, 0, 48);
/* Get the TEI from the mactotei table. */
- tei = cl_mactotei_table_find_tei_from_mac (ctx, mac & MAC_BROADCAST);
+ tei = cl_mactotei_table_find_tei_from_mac (ctx, mac);
dbg_assert (tei != ctx->mac_config->tei);
// if the TEI is not found the packet is send as broadcast.
@@ -576,7 +576,7 @@ cl_data_send (cl_t *cl, u8 *buffer, uint length, uint tag,
/* Bridging management: buffer coming from the Linux contains a data. */
/* Get source MAC address. */
- mac_t src_mac = bitstream_direct_read_large (buffer + 6, 0, 48);
+ mac_t src_mac = bitstream_direct_read_large (buffer, 48, 48);
/* The source MAC address should not be not be a multicast, a zero address
* nor a broadcast one (note that checking multicast address also checks
* for broadcast). Linux, in bridging mode, handle this problem and reject
@@ -855,8 +855,8 @@ void cl_data_recv (cl_t *ctx, u8 *buffer, uint length, mfs_rx_t *mfs)
if (CONFIG_TRACE)
{
- mac_t src = bitstream_direct_read_large (buffer + 6, 0, 48);
mac_t dest = bitstream_direct_read_large (buffer, 0, 48);
+ mac_t src = bitstream_direct_read_large (buffer, 48, 48);
CL_TRACE (DATA_RECV, mac_ntb(), buffer, TRACE_U64(dest),
TRACE_U64(src), length);
}