diff options
| -rw-r--r-- | commands/Makefile | 1 | ||||
| -rw-r--r-- | commands/net.c | 66 | ||||
| -rw-r--r-- | include/net.h | 2 | ||||
| -rw-r--r-- | net/eth.c | 17 | ||||
| -rw-r--r-- | net/ifup.c | 2 |
5 files changed, 0 insertions, 88 deletions
diff --git a/commands/Makefile b/commands/Makefile index 37486dceb1..582175f631 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -22,7 +22,6 @@ obj-$(CONFIG_CMD_MSLEEP) += msleep.o obj-$(CONFIG_CMD_RESET) += reset.o obj-$(CONFIG_CMD_POWEROFF) += poweroff.o obj-$(CONFIG_CMD_GO) += go.o -obj-$(CONFIG_NET) += net.o obj-$(CONFIG_CMD_PARTITION) += partition.o obj-$(CONFIG_CMD_LS) += ls.o obj-$(CONFIG_CMD_CD) += cd.o diff --git a/commands/net.c b/commands/net.c deleted file mode 100644 index 219c7efcda..0000000000 --- a/commands/net.c +++ /dev/null @@ -1,66 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -/** - * @file - * @brief tftp, rarpboot, dhcp, nfs, cdp - Boot support - */ - -#include <common.h> -#include <command.h> -#include <complete.h> -#include <environment.h> -#include <driver.h> -#include <net.h> -#include <fs.h> -#include <errno.h> -#include <libbb.h> - -static int do_ethact(int argc, char *argv[]) -{ - struct eth_device *edev; - - if (argc == 1) { - edev = eth_get_current(); - if (edev) - printf("%s%d\n", edev->dev.name, edev->dev.id); - return 0; - } - - if (argc != 2) - return COMMAND_ERROR_USAGE; - - edev = eth_get_byname(argv[1]); - if (edev) - eth_set_current(edev); - else { - printf("no such net device: %s\n", argv[1]); - return 1; - } - - return 0; -} - -BAREBOX_CMD_START(ethact) - .cmd = do_ethact, - BAREBOX_CMD_DESC("get or set current ethernet device") - BAREBOX_CMD_OPTS("[ETHX]") - BAREBOX_CMD_GROUP(CMD_GRP_NET) - BAREBOX_CMD_COMPLETE(eth_complete) -BAREBOX_CMD_END diff --git a/include/net.h b/include/net.h index 3faecff5d7..9f98b6f4df 100644 --- a/include/net.h +++ b/include/net.h @@ -413,8 +413,6 @@ static inline int is_valid_ether_addr(const u8 *addr) typedef void rx_handler_f(void *ctx, char *packet, unsigned int len); -void eth_set_current(struct eth_device *eth); -struct eth_device *eth_get_current(void); struct eth_device *eth_get_byname(const char *name); /** @@ -28,7 +28,6 @@ #include <errno.h> #include <malloc.h> -static struct eth_device *eth_current; static uint64_t last_link_check; LIST_HEAD(netdev_list); @@ -149,16 +148,6 @@ void of_eth_register_ethaddr(struct device_node *node, const char *ethaddr) list_add_tail(&addr->list, ðaddr_list); } -void eth_set_current(struct eth_device *eth) -{ - eth_current = eth; -} - -struct eth_device * eth_get_current(void) -{ - return eth_current; -} - struct eth_device *eth_get_byname(const char *ethname) { struct eth_device *edev; @@ -412,17 +401,11 @@ int eth_register(struct eth_device *edev) edev->parent->device_node) edev->nodepath = xstrdup(edev->parent->device_node->full_name); - if (!eth_current) - eth_current = edev; - return 0; } void eth_unregister(struct eth_device *edev) { - if (edev == eth_current) - eth_current = NULL; - if (edev->active) edev->halt(edev); diff --git a/net/ifup.c b/net/ifup.c index 2160e3ae46..423712e19c 100644 --- a/net/ifup.c +++ b/net/ifup.c @@ -58,8 +58,6 @@ int ifup(const char *name, unsigned flags) if (edev && edev->ipaddr && !(flags & IFUP_FLAG_FORCE)) return 0; - eth_set_current(edev); - env_push_context(); setenv("ip", ""); |