merge
authorpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Fri, 20 Dec 2013 20:18:50 +0000 (21:18 +0100)
committerpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Fri, 20 Dec 2013 20:18:50 +0000 (21:18 +0100)
1  2 
lib/lwip/src/core/ipv4/ip.c
lib/lwip/src/core/tcp_in.c
lib/lwip/src/core/udp.c
usr/drivers/e10k/e10k_qdriver.c

Simple merge
Simple merge
Simple merge
@@@ -367,15 -364,16 +368,16 @@@ static size_t check_for_new_packets(voi
      // TODO: This loop can cause very heavily bursty behaviour, if the packets
      // arrive faster than they can be processed.
      count = 0;
-     while (e10k_queue_get_rxbuf(q, &op, &len, &last) == 0) {
+     while (e10k_queue_get_rxbuf(q, &op, &len, &last, &flags) == 0) {
 -#if TRACE_ONLY_LLNET
 -        trace_event(TRACE_SUBSYS_LLNET, TRACE_EVENT_LLNET_DRVRX, 0);
 -#endif // TRACE_ONLY_LLNET
 +#if TRACE_ETHERSRV_MODE
 +        trace_event(TRACE_SUBSYS_NNET, TRACE_EVENT_NNET_DRVRX, 0);
 +#endif // TRACE_ETHERSRV_MODE
  
-         DEBUG("New packet (q=%d)\n", qi);
+         DEBUG("New packet (q=%d f=%"PRIx64")\n", qi, flags);
  
-         process_received_packet(op, len, !!last, 0);
+         process_received_packet(op, len, !!last, flags);
          count++;
+         flags = 0;
      }
  
      if (count > 0) e10k_queue_bump_rxtail(q);