diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:07 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:07 +0200 |
| commit | bfdb14c7dacf3e50a27b749259f6660ab9e930d5 (patch) | |
| tree | fe81dec7194671caee4e94ac7fb68fe6e519e6df /include | |
| parent | df75f19871d764c421cbce19f502ea863e5affd4 (diff) | |
| parent | e4a45c096136deaf56a200054c46f474250cc89c (diff) | |
| download | barebox-bfdb14c7dacf3e50a27b749259f6660ab9e930d5.tar.gz barebox-bfdb14c7dacf3e50a27b749259f6660ab9e930d5.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/net.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/net.h b/include/net.h index 8f857c8f85..632b6d5410 100644 --- a/include/net.h +++ b/include/net.h @@ -62,6 +62,7 @@ struct eth_device { IPaddr_t netmask; IPaddr_t gateway; char ethaddr[6]; + char *bootarg; }; #define dev_to_edev(d) container_of(d, struct eth_device, dev) @@ -257,9 +258,6 @@ static inline int net_eth_to_udplen(char *pkt) int net_checksum_ok(unsigned char *, int); /* Return true if cksum OK */ uint16_t net_checksum(unsigned char *, int); /* Calculate the checksum */ -/* Print an IP address on the console */ -void print_IPaddr (IPaddr_t); - /* * The following functions are a bit ugly, but necessary to deal with * alignment restrictions on ARM. @@ -308,9 +306,6 @@ static inline void net_copy_uint32(uint32_t *to, uint32_t *from) memcpy(to, from, sizeof(uint32_t)); } -/* Convert an IP address to a string */ -char *ip_to_string (IPaddr_t x); - /* Convert a string to ip address */ int string_to_ip(const char *s, IPaddr_t *ip); |