projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-server: Add "exit" unixctl command and --unixctl option.
[openvswitch]
/
datapath
/
actions.c
diff --git
a/datapath/actions.c
b/datapath/actions.c
index 30b840cbb6908e7562f99ef9e6e7e79cf3142393..8a3e8abb549e1302bdbed626bd889728bf2854f5 100644
(file)
--- a/
datapath/actions.c
+++ b/
datapath/actions.c
@@
-1,6
+1,9
@@
/*
* Distributed under the terms of the GNU GPL version 2.
* Copyright (c) 2007, 2008, 2009 Nicira Networks.
/*
* Distributed under the terms of the GNU GPL version 2.
* Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
*/
/* Functions for executing flow actions. */
*/
/* Functions for executing flow actions. */
@@
-93,7
+96,7
@@
modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
* when we send the packet out on the wire, and it will fail at
* that point because skb_checksum_setup() will not look inside
* an 802.1Q header. */
* when we send the packet out on the wire, and it will fail at
* that point because skb_checksum_setup() will not look inside
* an 802.1Q header. */
- skb_checksum_setup(skb);
+
vswitch_
skb_checksum_setup(skb);
/* GSO is not implemented for packets with an 802.1Q header, so
* we have to do segmentation before we add that header.
/* GSO is not implemented for packets with an 802.1Q header, so
* we have to do segmentation before we add that header.
@@
-358,7
+361,7
@@
int execute_actions(struct datapath *dp, struct sk_buff *skb,
* then freeing the original skbuff is wasteful. So the following code
* is slightly obscure just to avoid that. */
int prev_port = -1;
* then freeing the original skbuff is wasteful. So the following code
* is slightly obscure just to avoid that. */
int prev_port = -1;
- int err
= 0
;
+ int err;
for (; n_actions > 0; a++, n_actions--) {
WARN_ON_ONCE(skb_shared(skb));
if (prev_port != -1) {
for (; n_actions > 0; a++, n_actions--) {
WARN_ON_ONCE(skb_shared(skb));
if (prev_port != -1) {
@@
-417,5
+420,5
@@
int execute_actions(struct datapath *dp, struct sk_buff *skb,
do_output(dp, skb, prev_port);
else
kfree_skb(skb);
do_output(dp, skb, prev_port);
else
kfree_skb(skb);
- return
err
;
+ return
0
;
}
}