summaryrefslogtreecommitdiff
path: root/gr-uhd/lib
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-31 14:15:59 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-31 14:15:59 -0400
commite5bbe211445e95bc3c8b77bb85092968e86272e1 (patch)
treebc7f0d4c7fa89f40dd17ba9adb157a85c3086af6 /gr-uhd/lib
parent22a5a0236f4ccc41181cf49ee366ae1b0c5b1976 (diff)
parent254871ab525d1ef35fcb3d4672ab258927a8dbc1 (diff)
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib')
-rw-r--r--gr-uhd/lib/usrp_sink_impl.cc3
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 c9ccb70403..844f941020 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
*