X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=24c2a88fa3f38aaeb6e75db9991cfc13c58a0aa3;hb=d295e8e97acae13552a5b220d3fbcff8201064a2;hp=371bc205105fe6617be7a31f2d9fc80855e10a10;hpb=90a249dc93ccabd398b64092121b07e5af2d8c2d;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 371bc2051..24c2a88fa 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -208,7 +208,7 @@ compare_device_args(const struct netdev_dev *dev, const struct shash *args) new_args = shash_sort(args); for (i = 0; i < dev->n_args; i++) { - if (strcmp(dev->args[i].key, new_args[i]->name) || + if (strcmp(dev->args[i].key, new_args[i]->name) || strcmp(dev->args[i].value, new_args[i]->data)) { result = false; goto finish; @@ -327,7 +327,7 @@ netdev_open(struct netdev_options *options, struct netdev **netdevp) return EINVAL; } - error = netdev_dev->netdev_class->open(netdev_dev, options->ethertype, + error = netdev_dev->netdev_class->open(netdev_dev, options->ethertype, netdevp); if (!error) { @@ -729,7 +729,7 @@ netdev_get_in4(const struct netdev *netdev, int error; error = (netdev_get_dev(netdev)->netdev_class->get_in4 - ? netdev_get_dev(netdev)->netdev_class->get_in4(netdev, + ? netdev_get_dev(netdev)->netdev_class->get_in4(netdev, &address, &netmask) : EOPNOTSUPP); if (address_) { @@ -804,7 +804,7 @@ netdev_get_in6(const struct netdev *netdev, struct in6_addr *in6) int error; error = (netdev_get_dev(netdev)->netdev_class->get_in6 - ? netdev_get_dev(netdev)->netdev_class->get_in6(netdev, + ? netdev_get_dev(netdev)->netdev_class->get_in6(netdev, in6 ? in6 : &dummy) : EOPNOTSUPP); if (error && in6) { @@ -825,7 +825,7 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off, enum netdev_flags old_flags; int error; - error = netdev_get_dev(netdev)->netdev_class->update_flags(netdev, + error = netdev_get_dev(netdev)->netdev_class->update_flags(netdev, off & ~on, on, &old_flags); if (error) { VLOG_WARN_RL(&rl, "failed to %s flags for network device %s: %s", @@ -900,7 +900,7 @@ netdev_arp_lookup(const struct netdev *netdev, uint32_t ip, uint8_t mac[ETH_ADDR_LEN]) { int error = (netdev_get_dev(netdev)->netdev_class->arp_lookup - ? netdev_get_dev(netdev)->netdev_class->arp_lookup(netdev, + ? netdev_get_dev(netdev)->netdev_class->arp_lookup(netdev, ip, mac) : EOPNOTSUPP); if (error) { @@ -915,7 +915,7 @@ int netdev_get_carrier(const struct netdev *netdev, bool *carrier) { int error = (netdev_get_dev(netdev)->netdev_class->get_carrier - ? netdev_get_dev(netdev)->netdev_class->get_carrier(netdev, + ? netdev_get_dev(netdev)->netdev_class->get_carrier(netdev, carrier) : EOPNOTSUPP); if (error) { @@ -961,7 +961,7 @@ netdev_set_policing(struct netdev *netdev, uint32_t kbits_rate, uint32_t kbits_burst) { return (netdev_get_dev(netdev)->netdev_class->set_policing - ? netdev_get_dev(netdev)->netdev_class->set_policing(netdev, + ? netdev_get_dev(netdev)->netdev_class->set_policing(netdev, kbits_rate, kbits_burst) : EOPNOTSUPP); } @@ -1254,7 +1254,7 @@ 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, + ? netdev_get_dev(netdev)->netdev_class->get_vlan_vid(netdev, vlan_vid) : ENOENT); if (error) { @@ -1419,7 +1419,7 @@ netdev_uninit(struct netdev *netdev, bool close) } -/* Returns the class type of 'netdev'. +/* Returns the class type of 'netdev'. * * The caller must not free the returned value. */ const char *