X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport.h;h=5a7caf5f76ea4cb0472a59d9ca2d6e0cd48ae496;hb=bb1c9a6518807ac131a3a7ce77453004e05262e4;hp=8f03f2e981538e5b1e43afcea19b27f2128f5354;hpb=821cb9fac77850ae3546ab38766a58ff5e75e8a8;p=openvswitch diff --git a/datapath/vport.h b/datapath/vport.h index 8f03f2e9..5a7caf5f 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Nicira Networks. + * Copyright (c) 2007-2012 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -20,34 +20,39 @@ #define VPORT_H 1 #include +#include #include #include #include #include -#include "datapath.h" +#include "vport-capwap.h" struct vport; struct vport_parms; +struct vport_net { + struct capwap_net capwap; +}; + /* The following definitions are for users of the vport subsytem: */ -int vport_init(void); -void vport_exit(void); +int ovs_vport_init(void); +void ovs_vport_exit(void); -struct vport *vport_add(const struct vport_parms *); -void vport_del(struct vport *); +struct vport *ovs_vport_add(const struct vport_parms *); +void ovs_vport_del(struct vport *); -struct vport *vport_locate(const char *name); +struct vport *ovs_vport_locate(struct net *net, const char *name); -int vport_set_addr(struct vport *, const unsigned char *); -void vport_set_stats(struct vport *, struct ovs_vport_stats *); -void vport_get_stats(struct vport *, struct ovs_vport_stats *); +int ovs_vport_set_addr(struct vport *, const unsigned char *); +void ovs_vport_set_stats(struct vport *, struct ovs_vport_stats *); +void ovs_vport_get_stats(struct vport *, struct ovs_vport_stats *); -int vport_set_options(struct vport *, struct nlattr *options); -int vport_get_options(const struct vport *, struct sk_buff *); +int ovs_vport_set_options(struct vport *, struct nlattr *options); +int ovs_vport_get_options(const struct vport *, struct sk_buff *); -int vport_send(struct vport *, struct sk_buff *); +int ovs_vport_send(struct vport *, struct sk_buff *); /* The following definitions are for implementers of vport devices: */ @@ -75,10 +80,10 @@ struct vport_err_stats { * @linkname: The name of the link from /sys/class/net//brif to this * &struct vport. (We keep this around so that we can delete it if the * device gets renamed.) Set to the null string when no link exists. - * @node: Element in @dp's @port_list. * @upcall_pid: The Netlink port to use for packets received on this port that * miss the flow table. * @hash_node: Element in @dev_table hash table in vport.c. + * @dp_hash_node: Element in @datapath->ports hash table in datapath.c. * @ops: Class structure. * @percpu_stats: Points to per-CPU statistics used and maintained by vport * @stats_lock: Protects @err_stats and @offset_stats. @@ -92,10 +97,10 @@ struct vport { struct datapath *dp; struct kobject kobj; char linkname[IFNAMSIZ]; - struct list_head node; u32 upcall_pid; struct hlist_node hash_node; + struct hlist_node dp_hash_node; const struct vport_ops *ops; struct vport_percpu_stats __percpu *percpu_stats; @@ -124,7 +129,7 @@ struct vport_parms { enum ovs_vport_type type; struct nlattr *options; - /* For vport_alloc(). */ + /* For ovs_vport_alloc(). */ struct datapath *dp; u16 port_no; u32 upcall_pid; @@ -141,7 +146,7 @@ struct vport_parms { * not set and initialzation fails then no vports of this type can be created. * @exit: Called at module unload. * @create: Create a new vport configured as specified. On success returns - * a new vport allocated with vport_alloc(), otherwise an ERR_PTR() value. + * a new vport allocated with ovs_vport_alloc(), otherwise an ERR_PTR() value. * @destroy: Destroys a vport. Must call vport_free() on the vport but not * before an RCU grace period has elapsed. * @set_options: Modify the configuration of an existing vport. May be %NULL @@ -205,9 +210,9 @@ enum vport_err_type { VPORT_E_TX_ERROR, }; -struct vport *vport_alloc(int priv_size, const struct vport_ops *, - const struct vport_parms *); -void vport_free(struct vport *); +struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *, + const struct vport_parms *); +void ovs_vport_free(struct vport *); #define VPORT_ALIGN 8 @@ -240,15 +245,17 @@ static inline struct vport *vport_from_priv(const void *priv) return (struct vport *)(priv - ALIGN(sizeof(struct vport), VPORT_ALIGN)); } -void vport_receive(struct vport *, struct sk_buff *); -void vport_record_error(struct vport *, enum vport_err_type err_type); +void ovs_vport_receive(struct vport *, struct sk_buff *); +void ovs_vport_record_error(struct vport *, enum vport_err_type err_type); /* List of statically compiled vport implementations. Don't forget to also * add yours to the list at the top of vport.c. */ -extern const struct vport_ops netdev_vport_ops; -extern const struct vport_ops internal_vport_ops; -extern const struct vport_ops patch_vport_ops; -extern const struct vport_ops gre_vport_ops; -extern const struct vport_ops capwap_vport_ops; +extern const struct vport_ops ovs_netdev_vport_ops; +extern const struct vport_ops ovs_internal_vport_ops; +extern const struct vport_ops ovs_patch_vport_ops; +extern const struct vport_ops ovs_gre_vport_ops; +extern const struct vport_ops ovs_gre_ft_vport_ops; +extern const struct vport_ops ovs_gre64_vport_ops; +extern const struct vport_ops ovs_capwap_vport_ops; #endif /* vport.h */