X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=api%2Fapi_net.c;h=7515c26e8b44edd3a4cc2e8184776cc97a4612c5;hb=358b6f72c28c80699536f7137063095116e1675e;hp=7b3805e8fdbec822a38739074d107857112d86ee;hpb=3e1b36bd584228b0a8070c8b63351aefda652523;p=oweals%2Fu-boot.git

diff --git a/api/api_net.c b/api/api_net.c
index 7b3805e8fd..7515c26e8b 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007 Semihalf
  *
  * Written by: Rafal Jaworowski <raj@semihalf.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <config.h>
@@ -12,8 +11,6 @@
 #include <linux/types.h>
 #include <api_public.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 #define DEBUG
 #undef DEBUG
 
@@ -25,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define errf(fmt, args...) do { printf("ERROR @ %s(): ", __func__); printf(fmt, ##args); } while (0)
 
-#ifdef CONFIG_CMD_NET
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
 
 static int dev_valid_net(void *cookie)
 {
@@ -37,7 +34,7 @@ int dev_open_net(void *cookie)
 	if (!dev_valid_net(cookie))
 		return API_ENODEV;
 
-	if (eth_init(gd->bd) < 0)
+	if (eth_init() < 0)
 		return API_EIO;
 
 	return 0;