summaryrefslogtreecommitdiffstats
path: root/net/net.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-12-11 21:17:23 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-12-01 12:33:33 +0100
commit8b72bac28459ab818b2a308690e61d683e511bba (patch)
tree205c7bd40248090f19def71d6512025c87d49618 /net/net.c
parentd8bc8a33d9a4d39c2ac84cc7d119054bf12e16d3 (diff)
downloadbarebox-8b72bac28459ab818b2a308690e61d683e511bba.tar.gz
barebox-8b72bac28459ab818b2a308690e61d683e511bba.tar.xz
net: introduce global.net.server
The server to use is independent of the network device, there is not much point to make the server specific to a network device. This introduces global.net.server as the serverip which is used as standard NFS/tftp server. The previously used eth device specific parameters still exist, but are only aliases for the global single variable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'net/net.c')
-rw-r--r--net/net.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/net.c b/net/net.c
index 1ebf0008cb..5e6e8f1940 100644
--- a/net/net.c
+++ b/net/net.c
@@ -44,6 +44,7 @@
unsigned char *NetRxPackets[PKTBUFSRX]; /* Receive packets */
static unsigned int net_ip_id;
+IPaddr_t net_serverip;
static IPaddr_t net_nameserver;
static char *net_domainname;
@@ -244,16 +245,12 @@ static uint16_t net_udp_new_localport(void)
IPaddr_t net_get_serverip(void)
{
- struct eth_device *edev = eth_get_current();
-
- return edev->serverip;
+ return net_serverip;
}
void net_set_serverip(IPaddr_t ip)
{
- struct eth_device *edev = eth_get_current();
-
- edev->serverip = ip;
+ net_serverip = ip;
}
void net_set_ip(IPaddr_t ip)
@@ -608,6 +605,7 @@ static int net_init(void)
globalvar_add_simple_ip("net.nameserver", &net_nameserver);
globalvar_add_simple_string("net.domainname", &net_domainname);
+ globalvar_add_simple_ip("net.server", &net_serverip);
return 0;
}
@@ -616,3 +614,4 @@ postcore_initcall(net_init);
BAREBOX_MAGICVAR_NAMED(global_net_nameserver, global.net.nameserver, "The DNS server used for resolving host names");
BAREBOX_MAGICVAR_NAMED(global_net_domainname, global.net.domainname, "Domain name used for DNS requests");
+BAREBOX_MAGICVAR_NAMED(global_net_server, global.net.server, "Standard server used for NFS/TFTP");