merge
authorpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Fri, 20 Dec 2013 21:34:43 +0000 (22:34 +0100)
committerpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Fri, 20 Dec 2013 21:34:43 +0000 (22:34 +0100)
1  2 
errors/errno.fugu
lib/net_queue_manager/net_soft_filters_srv_impl.c
lib/pci/pci_client.c
usr/drivers/e10k/Hakefile
usr/drivers/e10k/e10k_qdriver.c

Simple merge
@@@ -66,9 -62,6 +66,7 @@@ static bool copy_bufs_to_user(struct bu
                                size_t count,
                                uint64_t flags);
  
 +
- void* sf_rx_ring_buffer(void *opaque);
  // Initialize interface for soft_filters channel
  static struct net_soft_filters_rx_vtbl rx_net_soft_filters_vtbl = {
      .register_filter_memory_request = register_filter_memory_request,
Simple merge
  
  [ build application { target = "e10k_queue",
                        cFiles = [ "e10k_qdriver.c", "helper.c"],
 -                      flounderBindings = [ "net_queue_manager",
 -                                           "net_soft_filters",
 -                                           "e10k" ],
 +                      flounderBindings = [ "net_queue_manager", "net_soft_filters", "e10k" ],
                        mackerelDevices = [ "e10k", "e10k_q" ],
-                       addLibraries = libDeps [ "netQmng", "trace" ]
+                       addLibraries = libDeps [ "netQmng", "trace", "skb",
+                                                "pci" ]
                      },
  
    build application { target = "e10k_monolithic",
                      },
  
    build application { target = "e10k",
-                       cFiles = [ "e10k_cdriver.c", "e10k_phy.c", "sleep.c"],
+                       cFiles = [ "e10k_cdriver.c", "e10k_phy.c", "sleep.c",
+                                  "helper.c"],
 -                      flounderBindings = [ "e10k"],
 +                      flounderBindings = [ "net_queue_manager", "net_soft_filters", "e10k" ],
 +                      --flounderBindings = [ "e10k"],
                        mackerelDevices = [ "e10k" ],
                        addLibraries = [ "pci", "contmng", "net_device_manager",
-                                        "bench", "trace" ]
+                                        "bench", "trace", "skb" ]
                      },
  
    build application { target = "e10k_queue_elb",
                        cFiles = [ "e10k_qdriver.c", "helper.c" ],
 -                      flounderBindings = [ "e10k" ],
 +                      flounderBindings = [ "net_queue_manager", "net_soft_filters", "e10k" ],
 +                      --flounderBindings = [ "e10k" ],
                        mackerelDevices = [ "e10k", "e10k_q" ],
                        addLibraries = libDeps ["ethernet_latency_benchmark", "bench",
-                                               "trace" ] },
+                                               "trace", "skb", "pci" ] },
  
    build application { target = "e10k_mono_elb",
                        cFiles = [ "e10k_cdriver.c", "e10k_phy.c", "sleep.c",
  
    build application { target = "e10k_queue_tlb",
                        cFiles = [ "e10k_qdriver.c", "helper.c"],
 -                      flounderBindings = [ "e10k" ],
 +                      flounderBindings = [ "net_queue_manager", "net_soft_filters", "e10k" ],
 +                      --flounderBindings = [ "e10k" ],
                        mackerelDevices = [ "e10k", "e10k_q" ],
                        addLibraries = [ "tcp_latency_benchmark", "trace", "bench",
-                                        "lwip" ]
+                                        "lwip", "skb", "pci" ]
                      }
  
  ]
@@@ -766,19 -791,19 +796,24 @@@ static void eventloop_ints(void
      }
  }
  
+ static void interrupt_handler(void *data)
+ {
+     qd_interrupt(true, false);
+ }
  void qd_interrupt(bool is_rx, bool is_tx)
  {
 -#if TRACE_ONLY_LLNET
 -    trace_event(TRACE_SUBSYS_LLNET, TRACE_EVENT_LLNET_DRVIRQ, 0);
 -#endif // TRACE_ONLY_LLNET
 +    size_t count;
 +
 +#if TRACE_ETHERSRV_MODE
 +    trace_event(TRACE_SUBSYS_NNET, TRACE_EVENT_NNET_NI_I, 0);
 +#endif // TRACE_ETHERSRV_MODE
  
      if (is_rx) {
 -        check_for_new_packets();
 +        count = check_for_new_packets();
 +        if (count == 0) {
 +            //printf("No RX\n");
 +        }
      }
      check_for_free_txbufs();
  }