diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-31 14:15:12 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-31 14:15:12 -0400 |
| commit | 254871ab525d1ef35fcb3d4672ab258927a8dbc1 (patch) | |
| tree | 93e80ad757dd89d7aa122e2ed07ac869372fc944 /gr-uhd | |
| parent | 265e729189ad55edf4f5447cb42589e980b92efa (diff) | |
| parent | 3d18f70c66c974a82c5096acc4cbd37a47b6b55c (diff) | |
Merge branch 'maint'
Conflicts:
gr-uhd/lib/usrp_sink_impl.cc
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/lib/usrp_sink_impl.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc index cdbe7b58f4..20f6fd6237 100644 --- a/gr-uhd/lib/usrp_sink_impl.cc +++ b/gr-uhd/lib/usrp_sink_impl.cc @@ -635,9 +635,6 @@ namespace gr { if (my_tag_count >= max_count) { break; } - else if (not pmt::is_null(_length_tag_key) and my_tag_count > samp0_count + _nitems_to_send) { - break; - } /* I. Tags that can only be on the first sample of a burst * |