X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=e4e7ab132eea510f1dce5a48ca16ada912c2ad7a;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=70f9678b20e176e65f988987a8d016111b3439c7;hpb=ee9bed06cd2794ced29190b6c6539993159d76f5;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 70f9678b2..e4e7ab132 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -516,7 +516,7 @@ netdev_get_mtu(const struct netdev *netdev, int *mtup) if (error) { *mtup = 0; if (error != EOPNOTSUPP) { - VLOG_WARN_RL(&rl, "failed to retrieve MTU for network device %s: " + VLOG_DBG_RL(&rl, "failed to retrieve MTU for network device %s: " "%s", netdev_get_name(netdev), strerror(error)); } } @@ -537,7 +537,7 @@ netdev_set_mtu(const struct netdev *netdev, int mtu) error = class->set_mtu ? class->set_mtu(netdev, mtu) : EOPNOTSUPP; if (error && error != EOPNOTSUPP) { - VLOG_WARN_RL(&rl, "failed to retrieve MTU for network device %s: %s", + VLOG_DBG_RL(&rl, "failed to set MTU for network device %s: %s", netdev_get_name(netdev), strerror(error)); } @@ -576,13 +576,17 @@ netdev_get_ifindex(const struct netdev *netdev) * cases this function will always return EOPNOTSUPP. */ int netdev_get_features(const struct netdev *netdev, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer) + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer) { int (*get_features)(const struct netdev *netdev, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer); - uint32_t dummy[4]; + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer); + enum netdev_features dummy[4]; int error; if (!current) { @@ -600,7 +604,8 @@ netdev_get_features(const struct netdev *netdev, get_features = netdev_get_dev(netdev)->netdev_class->get_features; error = get_features - ? get_features(netdev, current, advertised, supported, peer) + ? get_features(netdev, current, advertised, supported, + peer) : EOPNOTSUPP; if (error) { *current = *advertised = *supported = *peer = 0; @@ -608,39 +613,47 @@ netdev_get_features(const struct netdev *netdev, return error; } -/* Returns the maximum speed of a network connection that has the "enum - * ofp_port_features" bits in 'features', in bits per second. If no bits that - * indicate a speed are set in 'features', assumes 100Mbps. */ +/* Returns the maximum speed of a network connection that has the NETDEV_F_* + * bits in 'features', in bits per second. If no bits that indicate a speed + * are set in 'features', assumes 100Mbps. */ uint64_t -netdev_features_to_bps(uint32_t features) +netdev_features_to_bps(enum netdev_features features) { enum { - F_10000MB = OFPPF_10GB_FD, - F_1000MB = OFPPF_1GB_HD | OFPPF_1GB_FD, - F_100MB = OFPPF_100MB_HD | OFPPF_100MB_FD, - F_10MB = OFPPF_10MB_HD | OFPPF_10MB_FD + F_1000000MB = NETDEV_F_1TB_FD, + F_100000MB = NETDEV_F_100GB_FD, + F_40000MB = NETDEV_F_40GB_FD, + F_10000MB = NETDEV_F_10GB_FD, + F_1000MB = NETDEV_F_1GB_HD | NETDEV_F_1GB_FD, + F_100MB = NETDEV_F_100MB_HD | NETDEV_F_100MB_FD, + F_10MB = NETDEV_F_10MB_HD | NETDEV_F_10MB_FD }; - return ( features & F_10000MB ? UINT64_C(10000000000) - : features & F_1000MB ? UINT64_C(1000000000) - : features & F_100MB ? UINT64_C(100000000) - : features & F_10MB ? UINT64_C(10000000) - : UINT64_C(100000000)); + return ( features & F_1000000MB ? UINT64_C(1000000000000) + : features & F_100000MB ? UINT64_C(100000000000) + : features & F_40000MB ? UINT64_C(40000000000) + : features & F_10000MB ? UINT64_C(10000000000) + : features & F_1000MB ? UINT64_C(1000000000) + : features & F_100MB ? UINT64_C(100000000) + : features & F_10MB ? UINT64_C(10000000) + : UINT64_C(100000000)); } -/* Returns true if any of the "enum ofp_port_features" bits that indicate a - * full-duplex link are set in 'features', otherwise false. */ +/* Returns true if any of the NETDEV_F_* bits that indicate a full-duplex link + * are set in 'features', otherwise false. */ bool -netdev_features_is_full_duplex(uint32_t features) +netdev_features_is_full_duplex(enum netdev_features features) { - return (features & (OFPPF_10MB_FD | OFPPF_100MB_FD | OFPPF_1GB_FD - | OFPPF_10GB_FD)) != 0; + return (features & (NETDEV_F_10MB_FD | NETDEV_F_100MB_FD | NETDEV_F_1GB_FD + | NETDEV_F_10GB_FD | NETDEV_F_40GB_FD + | NETDEV_F_100GB_FD | NETDEV_F_1TB_FD)) != 0; } /* Set the features advertised by 'netdev' to 'advertise'. Returns 0 if * successful, otherwise a positive errno value. */ int -netdev_set_advertisements(struct netdev *netdev, uint32_t advertise) +netdev_set_advertisements(struct netdev *netdev, + enum netdev_features advertise) { return (netdev_get_dev(netdev)->netdev_class->set_advertisements ? netdev_get_dev(netdev)->netdev_class->set_advertisements( @@ -692,6 +705,26 @@ netdev_set_in4(struct netdev *netdev, struct in_addr addr, struct in_addr mask) : EOPNOTSUPP); } +/* Obtains ad IPv4 address from device name and save the address in + * in4. Returns 0 if successful, otherwise a positive errno value. + */ +int +netdev_get_in4_by_name(const char *device_name, struct in_addr *in4) +{ + struct netdev *netdev; + int error; + + error = netdev_open(device_name, "system", &netdev); + if (error) { + in4->s_addr = htonl(0); + return error; + } + + error = netdev_get_in4(netdev, in4, NULL); + netdev_close(netdev); + return error; +} + /* Adds 'router' as a default IP gateway for the TCP/IP stack that corresponds * to 'netdev'. */ int @@ -732,12 +765,12 @@ netdev_get_next_hop(const struct netdev *netdev, * may be used to populate the status column of the Interface table as defined * in ovs-vswitchd.conf.db(5). */ int -netdev_get_status(const struct netdev *netdev, struct shash *sh) +netdev_get_drv_info(const struct netdev *netdev, struct shash *sh) { struct netdev_dev *dev = netdev_get_dev(netdev); - return (dev->netdev_class->get_status - ? dev->netdev_class->get_status(netdev, sh) + return (dev->netdev_class->get_drv_info + ? dev->netdev_class->get_drv_info(netdev, sh) : EOPNOTSUPP); } @@ -892,6 +925,15 @@ netdev_get_carrier(const struct netdev *netdev) return carrier; } +/* Returns the number of times 'netdev''s carrier has changed. */ +long long int +netdev_get_carrier_resets(const struct netdev *netdev) +{ + return (netdev_get_dev(netdev)->netdev_class->get_carrier_resets + ? netdev_get_dev(netdev)->netdev_class->get_carrier_resets(netdev) + : 0); +} + /* Attempts to force netdev_get_carrier() to poll 'netdev''s MII registers for * link status instead of checking 'netdev''s carrier. 'netdev''s MII * registers will be polled once ever 'interval' milliseconds. If 'netdev' @@ -1193,7 +1235,11 @@ netdev_get_queue_stats(const struct netdev *netdev, unsigned int queue_id, * Calling this function may be more efficient than calling netdev_get_queue() * for every queue. * - * 'cb' must not modify or free the 'details' argument passed in. + * 'cb' must not modify or free the 'details' argument passed in. It may + * delete or modify the queue passed in as its 'queue_id' argument. It may + * modify but must not delete any other queue within 'netdev'. 'cb' should not + * add new queues because this may cause some queues to be visited twice or not + * at all. * * Returns 0 if successful, otherwise a positive errno value. On error, some * configured queues may not have been included in the iteration. */ @@ -1241,24 +1287,6 @@ netdev_change_seq(const struct netdev *netdev) { return netdev_get_dev(netdev)->netdev_class->change_seq(netdev); } - -/* If 'netdev' is a VLAN network device (e.g. one created with vconfig(8)), - * sets '*vlan_vid' to the VLAN VID associated with that device and returns 0. - * Otherwise returns a errno value (specifically ENOENT if 'netdev_name' is the - * name of a network device that is not a VLAN device) and sets '*vlan_vid' to - * -1. */ -int -netdev_get_vlan_vid(const struct netdev *netdev, int *vlan_vid) -{ - int error = (netdev_get_dev(netdev)->netdev_class->get_vlan_vid - ? netdev_get_dev(netdev)->netdev_class->get_vlan_vid(netdev, - vlan_vid) - : ENOENT); - if (error) { - *vlan_vid = 0; - } - return error; -} /* Initializes 'netdev_dev' as a netdev device named 'name' of the specified * 'netdev_class'. This function is ordinarily called from a netdev provider's