t/gr-ieee802-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
# Conflicts:
#	lib/utils.h
This commit is contained in:
Bastian Bloessl
2016-09-20 14:35:34 +02:00
parent 6f5faecabd 84c9ff3e0d
commit 1ef58db9c6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/utils.h
+1 -1
View File
@@ -29,7 +29,7 @@
#define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + 288) #define MAX_ENCODED_BITS ((16 + 8 * MAX_PSDU_SIZE + 6) * 2 + 288)
#define dout d_debug && std::cout #define dout d_debug && std::cout
#define mylog(msg) do { if(d_log) { GR_LOG_INFO(d_logger, msg) }} while(0); #define mylog(msg) do { if(d_log) { GR_LOG_INFO(d_logger, msg); }} while(0);
struct mac_header { struct mac_header {
//protocol version, type, subtype, to_ds, from_ds, ... //protocol version, type, subtype, to_ds, from_ds, ...