diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-15 13:43:04 +0100 |
| commit | a9d1b2dbf4a6808bd0d2e841e32802f5bffb362a (patch) | |
| tree | f5af1f80e4a215d1a5829aa5ea4f4458c4de61af /net/eth.c | |
| parent | 53227ec3c16fe50d7a3ca4020d3cb98878eeaa18 (diff) | |
| parent | 92a1e1b0f19aedcc1ec7b4e34f6597b4340cf96a (diff) | |
| download | barebox-a9d1b2dbf4a6808bd0d2e841e32802f5bffb362a.tar.gz barebox-a9d1b2dbf4a6808bd0d2e841e32802f5bffb362a.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'net/eth.c')
| -rw-r--r-- | net/eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -344,7 +344,7 @@ static int eth_register_of_fixup(void) late_initcall(eth_register_of_fixup); #endif -extern IPaddr_t net_serverip; +extern char *net_server; extern IPaddr_t net_gateway; static const char * const eth_mode_names[] = { @@ -384,7 +384,7 @@ int eth_register(struct eth_device *edev) edev->devname = xstrdup(dev_name(&edev->dev)); dev_add_param_ip(dev, "ipaddr", NULL, NULL, &edev->ipaddr, edev); - dev_add_param_ip(dev, "serverip", NULL, NULL, &net_serverip, edev); + dev_add_param_string(dev, "serverip", NULL, NULL, &net_server, edev); dev_add_param_ip(dev, "gateway", NULL, NULL, &net_gateway, edev); dev_add_param_ip(dev, "netmask", NULL, NULL, &edev->netmask, edev); dev_add_param_mac(dev, "ethaddr", eth_param_set_ethaddr, NULL, |