summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-09-30 18:51:51 -0400
committerTom Rini <trini@konsulko.com>2015-09-30 18:51:51 -0400
commit02c2c51cf75326d7e0347672a4715cc2597166bf (patch)
tree756e21ecc76413da7ed8826b8c87085fa773b885 /include
parent4af90a6d033bdde93d2fe03ed884a20e9359c4e5 (diff)
parent8ac46a98618ea21cf9900961fcff9cf803198271 (diff)
downloadtalos-obmc-uboot-02c2c51cf75326d7e0347672a4715cc2597166bf.tar.gz
talos-obmc-uboot-02c2c51cf75326d7e0347672a4715cc2597166bf.zip
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include')
-rw-r--r--include/net.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net.h b/include/net.h
index f1671e38de..3a787cc4e9 100644
--- a/include/net.h
+++ b/include/net.h
@@ -149,7 +149,9 @@ struct udevice *eth_get_dev(void); /* get the current device */
*/
struct udevice *eth_get_dev_by_name(const char *devname);
unsigned char *eth_get_ethaddr(void); /* get the current device MAC */
+
/* Used only when NetConsole is enabled */
+int eth_is_active(struct udevice *dev); /* Test device for active state */
int eth_init_state_only(void); /* Set active state */
void eth_halt_state_only(void); /* Set passive state */
#endif
@@ -195,6 +197,8 @@ static inline unsigned char *eth_get_ethaddr(void)
return NULL;
}
+/* Used only when NetConsole is enabled */
+int eth_is_active(struct eth_device *dev); /* Test device for active state */
/* Set active state */
static inline __attribute__((always_inline)) int eth_init_state_only(void)
{
OpenPOWER on IntegriCloud