#include <linux/list.h>
#include <linux/rtnetlink.h>
+#include "compat.h"
#include "datapath.h"
#include "vport.h"
#include "vport-generic.h"
static void update_peers(const char *name, struct vport *);
-static inline struct patch_vport *patch_vport_priv(const struct vport *vport)
+static struct patch_vport *patch_vport_priv(const struct vport *vport)
{
return vport_priv(vport);
}
kfree(peer_table);
}
-static const struct nla_policy patch_policy[ODP_PATCH_ATTR_MAX + 1] = {
+static const struct nla_policy patch_policy[OVS_PATCH_ATTR_MAX + 1] = {
#ifdef HAVE_NLA_NUL_STRING
- [ODP_PATCH_ATTR_PEER] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
+ [OVS_PATCH_ATTR_PEER] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
#endif
};
struct patch_config *patchconf)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
- struct nlattr *a[ODP_PATCH_ATTR_MAX + 1];
+ struct nlattr *a[OVS_PATCH_ATTR_MAX + 1];
const char *peer_name;
int err;
if (!options)
return -EINVAL;
- err = nla_parse_nested(a, ODP_PATCH_ATTR_MAX, options, patch_policy);
+ err = nla_parse_nested(a, OVS_PATCH_ATTR_MAX, options, patch_policy);
if (err)
return err;
- if (!a[ODP_PATCH_ATTR_PEER] || VERIFY_NUL_STRING(a[ODP_PATCH_ATTR_PEER], IFNAMSIZ - 1))
+ if (!a[OVS_PATCH_ATTR_PEER] ||
+ CHECK_NUL_STRING(a[OVS_PATCH_ATTR_PEER], IFNAMSIZ - 1))
return -EINVAL;
- peer_name = nla_data(a[ODP_PATCH_ATTR_PEER]);
+ peer_name = nla_data(a[OVS_PATCH_ATTR_PEER]);
if (!strcmp(patch_vport->name, peer_name))
return -EINVAL;
struct patch_config *patchconf;
int err;
- vport = vport_alloc(sizeof(struct patch_vport), &patch_vport_ops, parms);
+ vport = vport_alloc(sizeof(struct patch_vport),
+ &patch_vport_ops, parms);
if (IS_ERR(vport)) {
err = PTR_ERR(vport);
goto error;
vport_free(vport_from_priv(patch_vport));
}
-static int patch_destroy(struct vport *vport)
+static void patch_destroy(struct vport *vport)
{
struct patch_vport *patch_vport = patch_vport_priv(vport);
update_peers(patch_vport->name, NULL);
hlist_del(&patch_vport->hash_node);
call_rcu(&patch_vport->rcu, free_port_rcu);
-
- return 0;
}
static int patch_set_options(struct vport *vport, struct nlattr *options)
struct patch_vport *patch_vport = patch_vport_priv(vport);
struct patch_config *patchconf = rcu_dereference_rtnl(patch_vport->patchconf);
- return nla_put_string(skb, ODP_PATCH_ATTR_PEER, patchconf->peer_name);
+ return nla_put_string(skb, OVS_PATCH_ATTR_PEER, patchconf->peer_name);
}
static int patch_send(struct vport *vport, struct sk_buff *skb)
}
const struct vport_ops patch_vport_ops = {
- .type = ODP_VPORT_TYPE_PATCH,
- .flags = VPORT_F_GEN_STATS,
+ .type = OVS_VPORT_TYPE_PATCH,
.init = patch_init,
.exit = patch_exit,
.create = patch_create,