1 files changed, 41 insertions, 39 deletions
diff --git a/gr-digital/lib/ofdm_serializer_vcc_impl.cc b/gr-digital/lib/ofdm_serializer_vcc_impl.cc
index f6c796d3c5..1398dcd2a1 100644
--- a/gr-digital/lib/ofdm_serializer_vcc_impl.cc
+++ b/gr-digital/lib/ofdm_serializer_vcc_impl.cc
@@ -1,5 +1,5 @@
 /* -*- c++ -*- */
-/* Copyright 2012 Free Software Foundation, Inc.
+/* Copyright 2012,2014 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -157,55 +157,57 @@ namespace gr {
       std::vector<tag_t> tags;
       // Packet mode
       if (!d_length_tag_key_str.empty()) {
-	get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+1);
-	for (unsigned i = 0; i < tags.size(); i++) {
-	  if (tags[i].key == d_carr_offset_key) {
-	    carr_offset = pmt::to_long(tags[i].value);
-	  }
-	  if (tags[i].key == d_packet_len_tag_key) {
-	    packet_length = pmt::to_long(tags[i].value);
-	    remove_item_tag(0, tags[i]);
-	  }
-	}
+        get_tags_in_range(tags, 0, nitems_read(0), nitems_read(0)+1);
+        for (unsigned i = 0; i < tags.size(); i++) {
+          if (tags[i].key == d_carr_offset_key) {
+            carr_offset = pmt::to_long(tags[i].value);
+          }
+          if (tags[i].key == d_packet_len_tag_key) {
+            packet_length = pmt::to_long(tags[i].value);
+          }
+        }
       } else {
-	// recalc frame length from noutput_items
-	frame_length = 0;
-	int sym_per_frame = 0;
-	while ((sym_per_frame + d_occupied_carriers[(frame_length + 1) % d_occupied_carriers.size()].size()) < (size_t)noutput_items) {
-	  frame_length++;
-	  sym_per_frame += d_occupied_carriers[(frame_length + 1) % d_occupied_carriers.size()].size();
-	}
+        // recalc frame length from noutput_items
+        frame_length = 0;
+        int sym_per_frame = 0;
+        while ((sym_per_frame + d_occupied_carriers[(frame_length + 1) % d_occupied_carriers.size()].size()) < (size_t)noutput_items) {
+          frame_length++;
+          sym_per_frame += d_occupied_carriers[(frame_length + 1) % d_occupied_carriers.size()].size();
+        }
       }
 
       // Copy symbols
       int n_out_symbols = 0;
       for (int i = 0; i < frame_length; i++) {
-	// Copy all tags associated with this input OFDM symbol onto the first output symbol
-	get_tags_in_range(tags, 0,
-	  nitems_read(0)+i,
-	  nitems_read(0)+i+1
-	);
-	for (unsigned t = 0; t < tags.size(); t++) {
-	  add_item_tag(0, nitems_written(0)+n_out_symbols,
-	    tags[t].key,
-	    tags[t].value
-	  );
-	}
-	for (unsigned k = 0; k < d_occupied_carriers[d_curr_set].size(); k++) {
-	  out[n_out_symbols++] = in[i * d_fft_len + d_occupied_carriers[d_curr_set][k] + carr_offset];
-	}
-	if (packet_length && n_out_symbols > packet_length) {
-	  n_out_symbols = packet_length;
-	  break;
-	}
-	d_curr_set = (d_curr_set + 1) % d_occupied_carriers.size();
+        // Copy all tags associated with this input OFDM symbol onto the first output symbol
+        get_tags_in_range(tags, 0,
+            nitems_read(0)+i,
+            nitems_read(0)+i+1
+        );
+        for (size_t t = 0; t < tags.size(); t++) {
+          // The packet length tag is not propagated
+          if (tags[t].key != d_packet_len_tag_key) {
+            add_item_tag(0, nitems_written(0)+n_out_symbols,
+                tags[t].key,
+                tags[t].value
+            );
+          }
+        }
+        for (unsigned k = 0; k < d_occupied_carriers[d_curr_set].size(); k++) {
+          out[n_out_symbols++] = in[i * d_fft_len + d_occupied_carriers[d_curr_set][k] + carr_offset];
+        }
+        if (packet_length && n_out_symbols > packet_length) {
+          n_out_symbols = packet_length;
+          break;
+        }
+        d_curr_set = (d_curr_set + 1) % d_occupied_carriers.size();
       }
 
       // Housekeeping
       if (d_length_tag_key_str.empty()) {
-	consume_each(frame_length);
+        consume_each(frame_length);
       } else {
-	d_curr_set = d_symbols_skipped;
+        d_curr_set = d_symbols_skipped;
       }
 
       return n_out_symbols;