Networking: Condition certain ARP logic on CONFIG_NET_ARP in all Ethernet drivers

15 files changed, 51 insertions, 16 deletions

diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
index 94a88a26e..463bcacab 100644
--- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c
+++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c
@@ -5,7 +5,7 @@
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Based one a C5471 Linux driver and released under this BSD license with
- * special permisson from the copyright holder of the Linux driver:
+ * special permission from the copyright holder of the Linux driver:
  * Todd Fischer, Cadenux, LLC.  Other references: "TMS320VC547x CPU and
  * Peripherals Reference Guide," TI document spru038.pdf.
  *
@@ -1254,6 +1254,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
               c5471_transmit(c5471);
             }
         }
+#ifdef CONFIG_NET_ARP
       else if (BUF->type == HTONS(ETHTYPE_ARP))
         {
           arp_arpin(dev);
@@ -1270,6 +1271,7 @@ static void c5471_receive(struct c5471_driver_s *c5471)
               c5471_transmit(c5471);
             }
         }
+#endif
     }
 #ifdef CONFIG_C5471_NET_STATS
   else
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c
index b311cc529..5322121e6 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c
+++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c
@@ -535,6 +535,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
               kinetis_transmit(priv);
             }
         }
+#ifdef CONFIG_NET_ARP
       else if (BUF->type == htons(ETHTYPE_ARP))
         {
           arp_arpin(&priv->dev);
@@ -549,6 +550,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
               kinetis_transmit(priv);
             }
         }
+#endif
     }
 }
 
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
index 697ffab12..f63ef7b94 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -892,7 +892,9 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv)
                   lpc17_response(priv);
                 }
             }
-          else if (BUF->type == htons(ETHTYPE_ARP))
+          else
+#ifdef CONFIG_NET_ARP
+          if (BUF->type == htons(ETHTYPE_ARP))
             {
               EMAC_STAT(priv, rx_arp);
               arp_arpin(&priv->lp_dev);
@@ -908,6 +910,7 @@ static void lpc17_rxdone(struct lpc17_driver_s *priv)
                 }
             }
           else
+#endif
             {
               /* Unrecognized... drop it. */
 
diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c
index 32d276007..b599f5ba2 100644
--- a/nuttx/arch/arm/src/sam34/sam_emac.c
+++ b/nuttx/arch/arm/src/sam34/sam_emac.c
@@ -1163,7 +1163,9 @@ static void sam_receive(struct sam_emac_s *priv)
              sam_transmit(priv);
            }
         }
-      else if (BUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (BUF->type == htons(ETHTYPE_ARP))
         {
           nllvdbg("ARP frame\n");
 
@@ -1181,6 +1183,7 @@ static void sam_receive(struct sam_emac_s *priv)
             }
         }
       else
+#endif
         {
           nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
         }
diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c
index 9fc65c2c0..b0b1f363c 100644
--- a/nuttx/arch/arm/src/sama5/sam_emaca.c
+++ b/nuttx/arch/arm/src/sama5/sam_emaca.c
@@ -1203,7 +1203,9 @@ static void sam_receive(struct sam_emac_s *priv)
              sam_transmit(priv);
            }
         }
-      else if (BUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (BUF->type == htons(ETHTYPE_ARP))
         {
           nllvdbg("ARP frame\n");
 
@@ -1221,6 +1223,7 @@ static void sam_receive(struct sam_emac_s *priv)
             }
         }
       else
+#endif
         {
           nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
         }
diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c
index 8c705be06..b543f736a 100644
--- a/nuttx/arch/arm/src/sama5/sam_emacb.c
+++ b/nuttx/arch/arm/src/sama5/sam_emacb.c
@@ -1529,7 +1529,9 @@ static void sam_receive(struct sam_emac_s *priv)
              sam_transmit(priv);
            }
         }
-      else if (BUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (BUF->type == htons(ETHTYPE_ARP))
         {
           nllvdbg("ARP frame\n");
 
@@ -1547,6 +1549,7 @@ static void sam_receive(struct sam_emac_s *priv)
             }
         }
       else
+#endif
         {
           nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
         }
diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c
index 3a70c4b40..3c6468f3d 100644
--- a/nuttx/arch/arm/src/sama5/sam_gmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_gmac.c
@@ -1133,7 +1133,9 @@ static void sam_receive(struct sam_gmac_s *priv)
              sam_transmit(priv);
            }
         }
-      else if (BUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (BUF->type == htons(ETHTYPE_ARP))
         {
           nllvdbg("ARP frame\n");
 
@@ -1151,6 +1153,7 @@ static void sam_receive(struct sam_gmac_s *priv)
             }
         }
       else
+#endif
         {
           nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
         }
diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c
index a45725f84..1045bcd16 100644
--- a/nuttx/arch/arm/src/stm32/stm32_eth.c
+++ b/nuttx/arch/arm/src/stm32/stm32_eth.c
@@ -1639,7 +1639,9 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
              stm32_transmit(priv);
            }
         }
-      else if (BUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (BUF->type == htons(ETHTYPE_ARP))
         {
           nllvdbg("ARP frame\n");
 
@@ -1657,6 +1659,7 @@ static void stm32_receive(FAR struct stm32_ethmac_s *priv)
             }
         }
       else
+#endif
         {
           nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
         }
diff --git a/nuttx/arch/arm/src/tiva/lm3s_ethernet.c b/nuttx/arch/arm/src/tiva/lm3s_ethernet.c
index 899ceb2a8..6f9736c80 100644
--- a/nuttx/arch/arm/src/tiva/lm3s_ethernet.c
+++ b/nuttx/arch/arm/src/tiva/lm3s_ethernet.c
@@ -785,7 +785,9 @@ static void tiva_receive(struct tiva_driver_s *priv)
               tiva_transmit(priv);
             }
         }
-      else if (ETHBUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (ETHBUF->type == htons(ETHTYPE_ARP))
         {
           nllvdbg("ARP packet received (%02x)\n", ETHBUF->type);
           EMAC_STAT(priv, rx_arp);
@@ -801,13 +803,12 @@ static void tiva_receive(struct tiva_driver_s *priv)
                tiva_transmit(priv);
              }
         }
-#ifdef CONFIG_DEBUG
       else
+#endif
         {
           nlldbg("Unsupported packet type dropped (%02x)\n", htons(ETHBUF->type));
           EMAC_STAT(priv, rx_dropped);
         }
-#endif
     }
 }
 
diff --git a/nuttx/arch/arm/src/tiva/tm4c_ethernet.c b/nuttx/arch/arm/src/tiva/tm4c_ethernet.c
index 207ae42ac..1cb980d9a 100644
--- a/nuttx/arch/arm/src/tiva/tm4c_ethernet.c
+++ b/nuttx/arch/arm/src/tiva/tm4c_ethernet.c
@@ -1706,7 +1706,9 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
              tiva_transmit(priv);
            }
         }
-      else if (BUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (BUF->type == htons(ETHTYPE_ARP))
         {
           nvdbg("ARP frame\n");
 
@@ -1724,6 +1726,7 @@ static void tiva_receive(FAR struct tiva_ethmac_s *priv)
             }
         }
       else
+#endif
         {
           nlldbg("DROPPED: Unknown type: %04x\n", BUF->type);
         }
diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
index b179fb728..4fda5e752 100644
--- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -277,6 +277,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
              emac_transmit(priv);
            }
         }
+#ifdef CONFIG_NET_ARP
       else if (BUF->type == htons(ETHTYPE_ARP))
         {
           arp_arpin(&priv->d_dev);
@@ -290,6 +291,7 @@ static void emac_receive(FAR struct emac_driver_s *priv)
               emac_transmit(priv);
             }
         }
+#endif
     }
   while (true); /* While there are more packets to be processed */
 }
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
index 9b7946f8d..e71127dac 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c
@@ -1449,7 +1449,9 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
                   pic32mx_response(priv);
                 }
             }
-          else if (BUF->type == htons(ETHTYPE_ARP))
+          else
+#ifdef CONFIG_NET_ARP
+          if (BUF->type == htons(ETHTYPE_ARP))
             {
               /* Handle the incoming ARP packet */
 
@@ -1467,6 +1469,7 @@ static void pic32mx_rxdone(struct pic32mx_driver_s *priv)
                 }
             }
           else
+#endif
             {
               /* Unrecognized... drop it. */
 
diff --git a/nuttx/arch/sim/src/up_netdriver.c b/nuttx/arch/sim/src/up_netdriver.c
index 3c7b2a678..a91052521 100644
--- a/nuttx/arch/sim/src/up_netdriver.c
+++ b/nuttx/arch/sim/src/up_netdriver.c
@@ -179,6 +179,7 @@ void netdriver_loop(void)
                   netdev_send(g_sim_dev.d_buf, g_sim_dev.d_len);
                 }
             }
+#ifdef CONFIG_NET_ARP
           else if (BUF->ether_type == htons(ETHTYPE_ARP))
             {
               arp_arpin(&g_sim_dev);
@@ -193,6 +194,7 @@ void netdriver_loop(void)
                   netdev_send(g_sim_dev.d_buf, g_sim_dev.d_len);
                 }
             }
+#endif
         }
     }
 
diff --git a/nuttx/arch/sim/src/up_setjmp64.S b/nuttx/arch/sim/src/up_setjmp64.S
index 34c2429af..75c01dc03 100644
--- a/nuttx/arch/sim/src/up_setjmp64.S
+++ b/nuttx/arch/sim/src/up_setjmp64.S
@@ -103,7 +103,7 @@ SYMBOL(up_setjmp):
 	push	%rsi
 
 	/* Save registers */
-   /* Storage order: %rbx, %rsp, %rbp, %r12, %r13, %r14, %r15, %rip */
+	/* Storage order: %rbx, %rsp, %rbp, %r12, %r13, %r14, %r15, %rip */
 
 	movq	%rbp, JB_RBP(%rdi)	/* Save 3: rbp */
 	movq	%r12, JB_R12(%rdi)	/* Save 4: r12 */
diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c
index 3b19330cc..adbb11113 100644
--- a/nuttx/arch/z80/src/ez80/ez80_emac.c
+++ b/nuttx/arch/z80/src/ez80/ez80_emac.c
@@ -1287,7 +1287,9 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
               ez80emac_transmit(priv);
             }
         }
-      else if (ETHBUF->type == htons(ETHTYPE_ARP))
+      else
+#ifdef CONFIG_NET_ARP
+      if (ETHBUF->type == htons(ETHTYPE_ARP))
         {
           nvdbg("ARP packet received (%02x)\n", ETHBUF->type);
           EMAC_STAT(priv, rx_arp);
@@ -1303,13 +1305,13 @@ static int ez80emac_receive(struct ez80emac_driver_s *priv)
               ez80emac_transmit(priv);
             }
         }
-#ifdef CONFIG_DEBUG
       else
+#endif
         {
           ndbg("Unsupported packet type dropped (%02x)\n", ETHBUF->type);
           EMAC_STAT(priv, rx_dropped);
         }
-#endif
+
       npackets++;
     }
   return npackets;