merge

diff --cc include/net_queue_manager/net_queue_manager.h
Simple merge

diff --cc lib/net_queue_manager/net_soft_filters_srv_impl.c
index 6fd76ef,c0f7964..6d54d08
--- 1/lib/net_queue_manager/net_soft_filters_srv_impl.c
--- 2/lib/net_queue_manager/net_soft_filters_srv_impl.c
+++ b/lib/net_queue_manager/net_soft_filters_srv_impl.c
@@@ -1274,8 -1270,10 +1275,9 @@@ void sf_process_received_packet_lo(voi
  out:
       rx_ring_register_buffer(opaque_rx);
  } // end function: sf_process_received_packet_lo
+ #endif
  
  
 -
  void sf_process_received_packet(void *opaque, size_t pkt_len, bool is_last,
          uint64_t flags)
  {

diff --cc lib/net_queue_manager/queue_manager.c
index 7b752e2,74d2b1f..d6a3bb9
--- 1/lib/net_queue_manager/queue_manager.c
--- 2/lib/net_queue_manager/queue_manager.c
+++ b/lib/net_queue_manager/queue_manager.c
@@@ -855,19 -816,12 +855,20 @@@ static void raw_add_buffer(struct net_q
          cl->driver_buff_list[cl->chunk_counter].va = vaddr;
          cl->driver_buff_list[cl->chunk_counter].pa = paddr;
          cl->driver_buff_list[cl->chunk_counter].len = length;
 -        cl->driver_buff_list[cl->chunk_counter].flags = flags;
          cl->driver_buff_list[cl->chunk_counter].opaque = opaque;
 +        cl->driver_buff_list[cl->chunk_counter].flags = flags;
          ++cl->chunk_counter;
          if (more == 0) {
 +            // ETHERSRV_DEBUG
 +//            printf("sending out packet\n");
 +            if (cl->chunk_counter > 1) {
 +                ETHERSRV_DEBUG
 +                //printf
 +                    ("%s:%s: handle=%p\n", disp_name(), __func__,
 +                        opaque);
 +            }
-             err = ether_transmit_pbuf_list_ptr(cl->driver_buff_list, cl->chunk_counter, opaque);
+             err = ether_transmit_pbuf_list_ptr(cl->driver_buff_list,
 -                                               cl->chunk_counter);
++                    cl->chunk_counter);
              assert(err_is_ok(err));
              cl->chunk_counter = 0;
          }

diff --cc usr/drivers/e1000/e1000n.c
Simple merge

diff --cc usr/drivers/e10k/e10k_qdriver.c
Simple merge