projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Fix race against workqueue in dp_dev and simplify code.
[openvswitch]
/
datapath
/
datapath.h
diff --git
a/datapath/datapath.h
b/datapath/datapath.h
index 102b27f31f1af633d65bddd0333356297fe59425..455580f06f4bcf9a50500b9c54eb482b41c48597 100644
(file)
--- a/
datapath/datapath.h
+++ b/
datapath/datapath.h
@@
-1,3
+1,11
@@
+/*
+ * Copyright (c) 2009 Nicira Networks.
+ * Distributed under the terms of the GNU GPL version 2.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
+ */
+
/* Interface exported by openvswitch_mod. */
#ifndef DATAPATH_H
/* Interface exported by openvswitch_mod. */
#ifndef DATAPATH_H
@@
-13,8
+21,6
@@
#include "flow.h"
#include "brc_sysfs.h"
#include "flow.h"
#include "brc_sysfs.h"
-struct sk_buff;
-
/* Mask for the priority bits in a vlan header. If we ever merge upstream
* then this should go into include/linux/if_vlan.h. */
#define VLAN_PCP_MASK 0xe000
/* Mask for the priority bits in a vlan header. If we ever merge upstream
* then this should go into include/linux/if_vlan.h. */
#define VLAN_PCP_MASK 0xe000
@@
-114,11
+120,8
@@
int dp_table_foreach(struct dp_table *table,
void *aux);
void dp_process_received_packet(struct sk_buff *, struct net_bridge_port *);
void *aux);
void dp_process_received_packet(struct sk_buff *, struct net_bridge_port *);
-int dp_del_port(struct net_bridge_port *, struct list_head *);
-int dp_output_port(struct datapath *, struct sk_buff *, int out_port,
- int ignore_no_fwd);
+int dp_del_port(struct net_bridge_port *);
int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
-void dp_set_origin(struct datapath *, u16, struct sk_buff *);
struct datapath *get_dp(int dp_idx);
struct datapath *get_dp(int dp_idx);