Merge branch 'maint'

5 files changed, 5 insertions, 5 deletions

diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.h b/gnuradio-core/src/lib/hier/gr_channel_model.h
index 3f289e320..f0b31b1a6 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.h
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.h
@@ -36,7 +36,7 @@ GR_CORE_API gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0
 					    double frequency_offset=0.0,
 					    double epsilon=1.0,
 					    const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
-					    double noise_seed=3021);
+					    double noise_seed=0);
 
 /*!
  * \brief channel simulator
diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.i b/gnuradio-core/src/lib/hier/gr_channel_model.i
index 24a9388e5..9aa6ebf5b 100644
--- a/gnuradio-core/src/lib/hier/gr_channel_model.i
+++ b/gnuradio-core/src/lib/hier/gr_channel_model.i
@@ -26,7 +26,7 @@ gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0,
 					    double frequency_offset=0.0,
 					    double epsilon=1.0,
 					    const std::vector<gr_complex> &taps=std::vector<gr_complex>(1, 1),
-					    double noise_seed=3021);
+					    double noise_seed=0);
 
 class gr_channel_model : public gr_hier_block2
 {
diff --git a/gr-digital/examples/narrowband/benchmark_add_channel.py b/gr-digital/examples/narrowband/benchmark_add_channel.py
index 841833a08..c69ee60b0 100755
--- a/gr-digital/examples/narrowband/benchmark_add_channel.py
+++ b/gr-digital/examples/narrowband/benchmark_add_channel.py
@@ -44,7 +44,7 @@ class my_top_block(gr.top_block):
         self.src = gr.file_source(gr.sizeof_gr_complex, ifile)
         #self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
         self.channel = gr.channel_model(noise_voltage, frequency_offset,
-                                        time_offset, noise_seed=random.randint(0,100000))
+                                        time_offset, noise_seed=-random.randint(0,100000))
         self.phase = gr.multiply_const_cc(complex(math.cos(phase_offset),
                                                   math.sin(phase_offset)))
         self.snk = gr.file_sink(gr.sizeof_gr_complex, ofile)
diff --git a/gr-digital/examples/ofdm/benchmark_add_channel.py b/gr-digital/examples/ofdm/benchmark_add_channel.py
index 01776d209..cbdd990f4 100755
--- a/gr-digital/examples/ofdm/benchmark_add_channel.py
+++ b/gr-digital/examples/ofdm/benchmark_add_channel.py
@@ -46,7 +46,7 @@ class my_top_block(gr.top_block):
         self.src = gr.file_source(gr.sizeof_gr_complex, ifile)
         #self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
         self.channel = gr.channel_model(noise_voltage, frequency_offset,
-                                        time_offset, noise_seed=random.randint(0,100000))
+                                        time_offset, noise_seed=-random.randint(0,100000))
         self.phase = gr.multiply_const_cc(complex(math.cos(phase_offset),
                                                   math.sin(phase_offset)))
         self.snk = gr.file_sink(gr.sizeof_gr_complex, ofile)
diff --git a/gr-filter/include/filter/channel_model.h b/gr-filter/include/filter/channel_model.h
index 2e808de8e..49c08181f 100644
--- a/gr-filter/include/filter/channel_model.h
+++ b/gr-filter/include/filter/channel_model.h
@@ -68,7 +68,7 @@ namespace gr {
 				  double frequency_offset=0.0,
 				  double epsilon=1.0,
 				  const std::vector<gr_complex> &taps=std::vector<gr_complex>(1,1),
-				  double noise_seed=3021);
+				  double noise_seed=0);
 
       virtual void set_noise_voltage(double noise_voltage) = 0;
       virtual void set_frequency_offset(double frequency_offset) = 0;