diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-24 15:30:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-24 15:30:06 -0500 |
| commit | 68489ed037530ec29fc0bc452ad6e4b0c5db02ec (patch) | |
| tree | b1fb961b98f1e9a5ab5c3f0dc80fcfc32e00e689 /include | |
| parent | 0c3b301f79fcad081c8509ee4cb06e7b0478c8c1 (diff) | |
| parent | 91c9cbabf935b37ab6c0b9b622e7faf0b350acb6 (diff) | |
| download | u-boot-68489ed037530ec29fc0bc452ad6e4b0c5db02ec.tar.gz u-boot-68489ed037530ec29fc0bc452ad6e4b0c5db02ec.tar.xz u-boot-68489ed037530ec29fc0bc452ad6e4b0c5db02ec.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include')
| -rw-r--r-- | include/env_callback.h | 2 | ||||
| -rw-r--r-- | include/env_flags.h | 2 | ||||
| -rw-r--r-- | include/net.h | 15 | ||||
| -rw-r--r-- | include/phy.h | 1 |
4 files changed, 3 insertions, 17 deletions
diff --git a/include/env_callback.h b/include/env_callback.h index 3c44ff574b..507a52e13c 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -32,10 +32,8 @@ #ifdef CONFIG_REGEX #define ENV_DOT_ESCAPE "\\" -#define ETHADDR_WILDCARD "\\d?" #else #define ENV_DOT_ESCAPE -#define ETHADDR_WILDCARD #endif #ifdef CONFIG_CMD_DNS diff --git a/include/env_flags.h b/include/env_flags.h index cc2c34f939..23744e395c 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -38,7 +38,7 @@ enum env_flags_varaccess { #ifdef CONFIG_CMD_NET #ifdef CONFIG_REGEX -#define ETHADDR_WILDCARD "\\d?" +#define ETHADDR_WILDCARD "\\d*" #else #define ETHADDR_WILDCARD #endif diff --git a/include/net.h b/include/net.h index 51c099dae2..dd52ed3f47 100644 --- a/include/net.h +++ b/include/net.h @@ -140,9 +140,7 @@ struct eth_ops { int (*recv)(struct udevice *dev, int flags, uchar **packetp); int (*free_pkt)(struct udevice *dev, uchar *packet, int length); void (*stop)(struct udevice *dev); -#ifdef CONFIG_MCAST_TFTP int (*mcast)(struct udevice *dev, const u8 *enetaddr, int join); -#endif int (*write_hwaddr)(struct udevice *dev); int (*read_rom_hwaddr)(struct udevice *dev); }; @@ -175,9 +173,7 @@ struct eth_device { int (*send)(struct eth_device *, void *packet, int length); int (*recv)(struct eth_device *); void (*halt)(struct eth_device *); -#ifdef CONFIG_MCAST_TFTP - int (*mcast)(struct eth_device *, const u8 *enetaddr, u8 set); -#endif + int (*mcast)(struct eth_device *, const u8 *enetaddr, int join); int (*write_hwaddr)(struct eth_device *); struct eth_device *next; int index; @@ -286,12 +282,7 @@ extern void (*push_packet)(void *packet, int length); int eth_rx(void); /* Check for received packets */ void eth_halt(void); /* stop SCC */ const char *eth_get_name(void); /* get name of current device */ - -#ifdef CONFIG_MCAST_TFTP int eth_mcast_join(struct in_addr mcast_addr, int join); -u32 ether_crc(size_t len, unsigned char const *p); -#endif - /**********************************************************************/ /* @@ -578,10 +569,6 @@ extern struct in_addr net_ntp_server; /* the ip address to NTP */ extern int net_ntp_time_offset; /* offset time from UTC */ #endif -#if defined(CONFIG_MCAST_TFTP) -extern struct in_addr net_mcast_addr; -#endif - /* Initialize the network adapter */ void net_init(void); int net_loop(enum proto_t); diff --git a/include/phy.h b/include/phy.h index b86fdfb2ce..f23ca63f3b 100644 --- a/include/phy.h +++ b/include/phy.h @@ -138,6 +138,7 @@ struct phy_device { int pause; int asym_pause; u32 phy_id; + bool is_c45; u32 flags; }; |