diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-13 18:03:05 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-13 21:05:16 -0500 |
| commit | 774da4b9aadeea4d6973a16debc02a6801ff9344 (patch) | |
| tree | 6221335ba4d66b83fa3211d8ec3ac8feedbdde6a /include/net.h | |
| parent | 48ad68deb8f3f2046aad4197e7b1bc70533b4bb2 (diff) | |
| parent | 140bc33e05382545b762ef51d6fc31dd5b6ec82c (diff) | |
Merge git://git.denx.de/u-boot-net
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/net.h b/include/net.h index ebed29ad57..ac44d614ca 100644 --- a/include/net.h +++ b/include/net.h @@ -181,8 +181,7 @@ int eth_unregister(struct eth_device *dev);/* Remove network device */ extern struct eth_device *eth_current; -static inline __attribute__((always_inline)) -struct eth_device *eth_get_dev(void) +static __always_inline struct eth_device *eth_get_dev(void) { return eth_current; } @@ -200,14 +199,14 @@ static inline unsigned char *eth_get_ethaddr(void) /* 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) +static __always_inline int eth_init_state_only(void) { eth_get_dev()->state = ETH_STATE_ACTIVE; return 0; } /* Set passive state */ -static inline __attribute__((always_inline)) void eth_halt_state_only(void) +static __always_inline void eth_halt_state_only(void) { eth_get_dev()->state = ETH_STATE_PASSIVE; } @@ -657,7 +656,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, unsigned src_port, unsigned len); #endif -static inline __attribute__((always_inline)) int eth_is_on_demand_init(void) +static __always_inline int eth_is_on_demand_init(void) { #ifdef CONFIG_NETCONSOLE extern enum proto_t net_loop_last_protocol; |