#include <unistd.h>
#include "coverage.h"
+#include "dpif-linux.h"
#include "dynamic-string.h"
#include "fatal-signal.h"
#include "hash.h"
/* Create rtnetlink socket. */
if (!status) {
- status = nl_sock_create(NETLINK_ROUTE, 0, 0, 0, &rtnl_sock);
+ status = nl_sock_create(NETLINK_ROUTE, &rtnl_sock);
if (status) {
VLOG_ERR_RL(&rl, "failed to create rtnetlink socket: %s",
strerror(status));
cache_notifier_refcount++;
netdev_dev = xzalloc(sizeof *netdev_dev);
- netdev_dev_init(&netdev_dev->netdev_dev, name, class);
+ netdev_dev_init(&netdev_dev->netdev_dev, name, args, class);
*netdev_devp = &netdev_dev->netdev_dev;
return 0;
goto error;
}
- netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_tap_class);
+ netdev_dev_init(&netdev_dev->netdev_dev, name, args, &netdev_tap_class);
*netdev_devp = &netdev_dev->netdev_dev;
return 0;
const char *type = netdev_dev_get_type(&netdev_dev->netdev_dev);
netdev_dev->is_tap = !strcmp(type, "tap");
- netdev_dev->is_internal = false;
- if (!netdev_dev->is_tap) {
- struct ethtool_drvinfo drvinfo;
- int error;
-
- memset(&drvinfo, 0, sizeof drvinfo);
- error = netdev_linux_do_ethtool(name,
- (struct ethtool_cmd *)&drvinfo,
- ETHTOOL_GDRVINFO,
- "ETHTOOL_GDRVINFO");
-
- if (!error && !strcmp(drvinfo.driver, "openvswitch")) {
- netdev_dev->is_internal = true;
- }
- }
-
+ netdev_dev->is_internal = (!netdev_dev->is_tap
+ && dpif_linux_is_internal_device(name));
netdev_dev->cache_valid |= VALID_IS_PSEUDO;
}
}
\
CREATE, \
netdev_linux_destroy, \
- NULL, /* reconfigure */ \
+ NULL, /* set_config */ \
\
netdev_linux_open, \
netdev_linux_close, \
int mtu;
netdev_get_mtu(netdev, &mtu);
+ if (mtu == INT_MAX) {
+ VLOG_WARN_RL(&rl, "cannot set up HTB on device %s that lacks MTU",
+ netdev_get_name(netdev));
+ return EINVAL;
+ }
memset(&opt, 0, sizeof opt);
tc_fill_rate(&opt.rate, class->min_rate, mtu);
const char *priority_s = shash_find_data(details, "priority");
int mtu;
+ netdev_get_mtu(netdev, &mtu);
+ if (mtu == INT_MAX) {
+ VLOG_WARN_RL(&rl, "cannot parse HTB class on device %s that lacks MTU",
+ netdev_get_name(netdev));
+ return EINVAL;
+ }
+
/* min-rate. Don't allow a min-rate below 1500 bytes/s. */
if (!min_rate_s) {
/* min-rate is required. */
* doesn't include the Ethernet header, we need to add at least 14 (18?) to
* the MTU. We actually add 64, instead of 14, as a guard against
* additional headers get tacked on somewhere that we're not aware of. */
- netdev_get_mtu(netdev, &mtu);
hc->burst = burst_s ? strtoull(burst_s, NULL, 10) / 8 : 0;
hc->burst = MAX(hc->burst, mtu + 64);