git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test-reconnect: Fix a warning.
[sliver-openvswitch.git]
/
datapath
/
vport.h
diff --git
a/datapath/vport.h
b/datapath/vport.h
index
c23d35c
..
18b723e
100644
(file)
--- a/
datapath/vport.h
+++ b/
datapath/vport.h
@@
-94,9
+94,6
@@
struct vport {
struct ovs_vport_stats offset_stats;
};
struct ovs_vport_stats offset_stats;
};
-#define VPORT_F_REQUIRED (1 << 0) /* If init fails, module loading fails. */
-#define VPORT_F_TUN_ID (1 << 1) /* Sets OVS_CB(skb)->tun_id. */
-
/**
* struct vport_parms - parameters for creating a new vport
*
/**
* struct vport_parms - parameters for creating a new vport
*
@@
-122,12
+119,6
@@
struct vport_parms {
* struct vport_ops - definition of a type of virtual port
*
* @type: %OVS_VPORT_TYPE_* value for this type of virtual port.
* struct vport_ops - definition of a type of virtual port
*
* @type: %OVS_VPORT_TYPE_* value for this type of virtual port.
- * @flags: Flags of type VPORT_F_* that influence how the generic vport layer
- * handles this vport.
- * @init: Called at module initialization. If VPORT_F_REQUIRED is set then the
- * failure of this function will cause the module to not load. If the flag is
- * 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 ovs_vport_alloc(), otherwise an ERR_PTR() value.
* @destroy: Destroys a vport. Must call vport_free() on the vport but not
* @create: Create a new vport configured as specified. On success returns
* 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
@@
-138,15
+129,11
@@
struct vport_parms {
* existing vport to a &struct sk_buff. May be %NULL for a vport that does not
* have any configuration.
* @get_name: Get the device's name.
* existing vport to a &struct sk_buff. May be %NULL for a vport that does not
* have any configuration.
* @get_name: Get the device's name.
- * @send: Send a packet on the device. Returns the length of the packet sent.
+ * @send: Send a packet on the device. Returns the length of the packet sent,
+ * zero for dropped packets or negative for error.
*/
struct vport_ops {
enum ovs_vport_type type;
*/
struct vport_ops {
enum ovs_vport_type type;
- u32 flags;
-
- /* Called at module init and exit respectively. */
- int (*init)(void);
- void (*exit)(void);
/* Called with ovs_mutex. */
struct vport *(*create)(const struct vport_parms *);
/* Called with ovs_mutex. */
struct vport *(*create)(const struct vport_parms *);
@@
-171,6
+158,7
@@
enum vport_err_type {
struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *,
const struct vport_parms *);
void ovs_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 *);
+void ovs_vport_deferred_free(struct vport *vport);
#define VPORT_ALIGN 8
#define VPORT_ALIGN 8
@@
-185,7
+173,7
@@
void ovs_vport_free(struct vport *);
*/
static inline void *vport_priv(const struct vport *vport)
{
*/
static inline void *vport_priv(const struct vport *vport)
{
- return (u8 *)vport + ALIGN(sizeof(struct vport), VPORT_ALIGN);
+ return (u8 *)
(uintptr_t)
vport + ALIGN(sizeof(struct vport), VPORT_ALIGN);
}
/**
}
/**
@@
-198,13
+186,13
@@
static inline void *vport_priv(const struct vport *vport)
* the result of a hash table lookup. @priv must point to the start of the
* private data area.
*/
* the result of a hash table lookup. @priv must point to the start of the
* private data area.
*/
-static inline struct vport *vport_from_priv(
const
void *priv)
+static inline struct vport *vport_from_priv(void *priv)
{
{
- return (struct vport *)(priv - ALIGN(sizeof(struct vport), VPORT_ALIGN));
+ return (struct vport *)(
(u8 *)
priv - ALIGN(sizeof(struct vport), VPORT_ALIGN));
}
}
-void ovs_vport_receive(struct vport *, struct sk_buff *
);
-
void ovs_vport_record_error(struct vport *, enum vport_err_type err_type
);
+void ovs_vport_receive(struct vport *, struct sk_buff *
,
+
struct ovs_key_ipv4_tunnel *
);
/* List of statically compiled vport implementations. Don't forget to also
* add yours to the list at the top of vport.c. */
/* List of statically compiled vport implementations. Don't forget to also
* add yours to the list at the top of vport.c. */
@@
-215,4
+203,10
@@
extern const struct vport_ops ovs_gre64_vport_ops;
extern const struct vport_ops ovs_vxlan_vport_ops;
extern const struct vport_ops ovs_lisp_vport_ops;
extern const struct vport_ops ovs_vxlan_vport_ops;
extern const struct vport_ops ovs_lisp_vport_ops;
+static inline void ovs_skb_postpush_rcsum(struct sk_buff *skb,
+ const void *start, unsigned int len)
+{
+ if (skb->ip_summed == CHECKSUM_COMPLETE)
+ skb->csum = csum_add(skb->csum, csum_partial(start, len, 0));
+}
#endif /* vport.h */
#endif /* vport.h */