projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Add spaces between commas to avoid overflowing line during formatting.
[openvswitch]
/
datapath
/
vport-netdev.c
diff --git
a/datapath/vport-netdev.c
b/datapath/vport-netdev.c
index bc3108b95dff9f5e3c8341b6c7eafffafb6c9704..f1e9b09d0deab3fd49b3e94aad58a31aab526504 100644
(file)
--- a/
datapath/vport-netdev.c
+++ b/
datapath/vport-netdev.c
@@
-343,10
+343,12
@@
static int netdev_send(struct vport *vport, struct sk_buff *skb)
goto tag;
}
goto tag;
}
- kfree_skb(skb);
- skb = nskb;
- if (IS_ERR(skb))
+ if (IS_ERR(nskb)) {
+ kfree_skb(skb);
return 0;
return 0;
+ }
+ consume_skb(skb);
+ skb = nskb;
len = 0;
do {
len = 0;
do {
@@
-397,7
+399,7
@@
struct vport *netdev_get_vport(struct net_device *dev)
}
const struct vport_ops netdev_vport_ops = {
}
const struct vport_ops netdev_vport_ops = {
- .type = O
DP
_VPORT_TYPE_NETDEV,
+ .type = O
VS
_VPORT_TYPE_NETDEV,
.flags = (VPORT_F_REQUIRED |
(USE_VPORT_STATS ? VPORT_F_GEN_STATS : 0)),
.init = netdev_init,
.flags = (VPORT_F_REQUIRED |
(USE_VPORT_STATS ? VPORT_F_GEN_STATS : 0)),
.init = netdev_init,