Merge branch 'release' into agc_and_csma

2015-04-20 15:12:54 +02:00
parent 9614b4a459 05dbde69d6
commit c664ac99a7
34 changed files with 5988 additions and 4426 deletions
@@ -82,8 +82,8 @@ int general_work(int noutput, gr_vector_int& ninput_items,

 			// ############ INSERT MAC STUFF
 			tx_param tx(d_ofdm, psdu_length);
-			if(tx.n_sym > 120) {
-				std::cout << "packet too large" <<std::endl;
+			if(tx.n_sym > MAX_SYM) {
+				std::cout << "packet too large, maximum number of symbols is " << MAX_SYM << std::endl;
 				return 0;
 			}