Change lwIP if_input to call ethernet_input.

523eb643 · Silas Boyd-Wickizer · 00749357 · 523eb643
--- a/net/if.c
+++ b/net/if.c
@@ -166,20 +166,13 @@ if_input(struct netif *netif, void *buf, u16 len)
  /* IP or ARP packet? */
  case ETHTYPE_IP:
  case ETHTYPE_ARP:
-#if PPPOE_SUPPORT
+    if (ethernet_input(p, netif) != ERR_OK) {
-  /* PPPoE packet? */
+      cprintf("if_input: ethernet_input failed\n");
-  case ETHTYPE_PPPOEDISC:
+      pbuf_free(p);
-  case ETHTYPE_PPPOE:
+    }
-#endif /* PPPOE_SUPPORT */
-    /* full packet send to tcpip_thread to process */
-    if (netif->input(p, netif)!=ERR_OK)
-     { LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_input: IP input error\n"));
-       pbuf_free(p);
-       p = NULL;
-     }
    break;
  default:
+    cprintf("if_input: unknown type %u\n", htons(ethhdr->type));
    pbuf_free(p);
    p = NULL;
    break;