/*
- * Copyright (c) 2011, 2013 Nicira, Inc.
+ * Copyright (c) 2011, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "hash.h"
#include "shash.h"
#include "socket-util.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
VLOG_DEFINE_THIS_MODULE(vlandev);
int (*vd_del)(const char *vlan_dev);
};
-#ifdef LINUX_DATAPATH
+#ifdef __linux__
static const struct vlandev_class vlandev_linux_class;
#endif
static const struct vlandev_class vlandev_stub_class;
vlandev_get_class(void)
{
if (!vd_class) {
-#ifdef LINUX_DATAPATH
+#if __linux__
vd_class = &vlandev_linux_class;
#else
vd_class = &vlandev_stub_class;
\f
/* The Linux vlandev implementation. */
-#ifdef LINUX_DATAPATH
-#include "rtnetlink-link.h"
+#ifdef __linux__
+#include "rtnetlink.h"
#include <linux/if_vlan.h>
#include <linux/sockios.h>
#include "netdev-linux.h"
static bool cache_valid;
static void
-vlan_cache_cb(const struct rtnetlink_link_change *change OVS_UNUSED,
+vlan_cache_cb(const struct rtnetlink_change *change OVS_UNUSED,
void *aux OVS_UNUSED)
{
cache_valid = false;
FILE *stream;
if (!vlan_cache_notifier) {
- vlan_cache_notifier = rtnetlink_link_notifier_create(vlan_cache_cb,
- NULL);
+ vlan_cache_notifier = rtnetlink_notifier_create(vlan_cache_cb,
+ NULL);
if (!vlan_cache_notifier) {
return EINVAL;
}
char vlan_dev[16], real_dev[16];
int vid;
- if (sscanf(line, "%15[^ |] | %d | %15s",
- vlan_dev, &vid, real_dev) == 3) {
+ if (ovs_scan(line, "%15[^ |] | %d | %15s", vlan_dev, &vid, real_dev)) {
vlandev_add__(vlan_dev, real_dev, vid);
}
}
vlandev_del__(const char *vlan_dev)
{
struct shash_node *vd_node = shash_find(&vlan_devs, vlan_dev);
- if (!vd_node) {
+ if (vd_node) {
struct vlan_dev *vd = vd_node->data;
struct vlan_real_dev *vrd = vd->real_dev;