update

[l4.git] / l4 / pkg / ankh / lib / lwip / lib / arch / ankh_if.c

diff --git a/l4/pkg/ankh/lib/lwip/lib/arch/ankh_if.c b/l4/pkg/ankh/lib/lwip/lib/arch/ankh_if.c
index 96ba381e646a9c79e97bce7d8d4b8776333ad459..15bb471de251c210ff9ba6ba871282ca5e057d7e 100644 (file)
--- a/l4/pkg/ankh/lib/lwip/lib/arch/ankh_if.c
+++ b/l4/pkg/ankh/lib/lwip/lib/arch/ankh_if.c
@@ -223,7 +223,7 @@ low_level_input(struct netif *netif)
 
   /* Obtain the size of the packet and put it into the "len"
      variable. */
-  len = l4shmc_rb_receiver_read_next_size(HEAD(rb));
+  len = l4shmc_rb_receiver_read_next_size(L4SHMC_RINGBUF_HEAD(rb));
   if (len <= 0)
       return NULL;
 
@@ -244,7 +244,7 @@ low_level_input(struct netif *netif)
    * available data in the pbuf is given by the p->len
    * variable. */
     assert(p->len == len);
-    int err = l4shmc_rb_receiver_copy_out(HEAD(rb), p->payload, (unsigned*)&p->len);
+    int err = l4shmc_rb_receiver_copy_out(L4SHMC_RINGBUF_HEAD(rb), p->payload, (unsigned*)&p->len);
 #if 0
     printf("Incoming %p: ", p); __hexdump(p->payload, 12);
 #endif
@@ -400,7 +400,7 @@ err_t ankhif_init(struct netif *netif)
 static ankh_config_info cfg = { 2048, L4_INVALID_CAP,
                                 L4_INVALID_CAP, "" };
 // default interface
-static struct netif ankh_netif;
+struct netif ankh_netif;
 static ip_addr_t ipaddr, netmask, gw;
 
 static int try_l4re_option(int argc, char **argv, unsigned idx)
@@ -459,7 +459,9 @@ int l4_lwip_init(int *argc, char **argv)
 #endif
     dhcp_start(&ankh_netif);
     while(!netif_is_up(&ankh_netif)) {
-        printf("dhcp pending\n");
+#if DEBUG_L4LWIP_INIT
+        //printf("dhcp pending\n");
+#endif
         l4_sleep(1000);
     }
     printf("IP: "); print_ip(&ankh_netif.ip_addr); printf("\n");