diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-06 12:33:15 +0200 |
| commit | e188d2ec26e8cf6d4ba0908e76868e91b6999fdf (patch) | |
| tree | 268e1a3340d6e195a02068a31b70043088d95b8f /include | |
| parent | 4ee01d2b469f65d92c6e7759152cd31fbfbb1414 (diff) | |
| parent | ab8e23f239ddda7fff4d9a12a9d856d346e0d553 (diff) | |
| download | barebox-e188d2ec26e8cf6d4ba0908e76868e91b6999fdf.tar.gz barebox-e188d2ec26e8cf6d4ba0908e76868e91b6999fdf.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 1 | ||||
| -rw-r--r-- | include/net.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 9a451a62d8..a64b9b5671 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -297,6 +297,7 @@ int phy_update_status(struct phy_device *phydev); int phy_wait_aneg_done(struct phy_device *phydev); /* Generic PHY support and helper functions */ +int genphy_config_init(struct phy_device *phydev); int genphy_restart_aneg(struct phy_device *phydev); int genphy_config_aneg(struct phy_device *phydev); int genphy_aneg_done(struct phy_device *phydev); diff --git a/include/net.h b/include/net.h index b93e264f54..d7a475132a 100644 --- a/include/net.h +++ b/include/net.h @@ -445,7 +445,7 @@ struct net_connection *net_icmp_new(IPaddr_t dest, rx_handler_f *handler, void net_unregister(struct net_connection *con); -static inline int net_udp_bind(struct net_connection *con, int sport) +static inline int net_udp_bind(struct net_connection *con, uint16_t sport) { con->udp->uh_sport = ntohs(sport); return 0; |