diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-11-10 08:05:54 +0100 | 
| commit | 3e4d27b06d7484040355e22eec2cbce7335d6dab (patch) | |
| tree | 9672a2bb2e4ce0edc0ab776ddf0e2ca8e39a5f62 /include/net.h | |
| parent | bad05afe083eec0467220de21683443292c5012e (diff) | |
| parent | 59852d03867108217fe88e3bfc3e1e9cedfe63c5 (diff) | |
| download | olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.tar.xz olio-uboot-2014.01-3e4d27b06d7484040355e22eec2cbce7335d6dab.zip | |
Merge git://git.denx.de/u-boot
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 9 | 
1 files changed, 5 insertions, 4 deletions
| diff --git a/include/net.h b/include/net.h index 35393366d..970d4d1fa 100644 --- a/include/net.h +++ b/include/net.h @@ -102,12 +102,13 @@ extern int eth_register(struct eth_device* dev);/* Register network device */  extern int eth_unregister(struct eth_device *dev);/* Remove network device */  extern void eth_try_another(int first_restart);	/* Change the device */  extern void eth_set_current(void);		/* set nterface to ethcur var */ +  /* get the current device MAC */ +extern struct eth_device *eth_current; +  static inline __attribute__((always_inline))  struct eth_device *eth_get_dev(void)  { -	extern struct eth_device *eth_current; -  	return eth_current;  }  extern struct eth_device *eth_get_dev_by_name(const char *devname); @@ -517,10 +518,10 @@ enum net_loop_state {  	NETLOOP_SUCCESS,  	NETLOOP_FAIL  }; +extern enum net_loop_state net_state; +  static inline void net_set_state(enum net_loop_state state)  { -	extern enum net_loop_state net_state; -  	debug_cond(DEBUG_INT_STATE, "--- NetState set to %d\n", state);  	net_state = state;  } |