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
datapath: Remove checks for preinitialized flow.
[sliver-openvswitch.git]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index
a5f2d75
..
003e880
100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-92,7
+92,6
@@
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
}
vlan_copy_skb_tci(skb);
}
vlan_copy_skb_tci(skb);
- OVS_CB(skb)->flow = NULL;
rcu_read_lock();
ovs_vport_receive(internal_dev_priv(netdev)->vport, skb);
rcu_read_lock();
ovs_vport_receive(internal_dev_priv(netdev)->vport, skb);
@@
-115,7
+114,7
@@
static int internal_dev_stop(struct net_device *netdev)
static void internal_dev_getinfo(struct net_device *netdev,
struct ethtool_drvinfo *info)
{
static void internal_dev_getinfo(struct net_device *netdev,
struct ethtool_drvinfo *info)
{
- str
cpy(info->driver, "openvswitch"
);
+ str
lcpy(info->driver, "openvswitch", sizeof(info->driver)
);
}
static const struct ethtool_ops internal_dev_ethtool_ops = {
}
static const struct ethtool_ops internal_dev_ethtool_ops = {
@@
-289,7
+288,7
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
const struct vport_ops ovs_internal_vport_ops = {
.type = OVS_VPORT_TYPE_INTERNAL,
const struct vport_ops ovs_internal_vport_ops = {
.type = OVS_VPORT_TYPE_INTERNAL,
- .flags = VPORT_F_REQUIRED
| VPORT_F_FLOW
,
+ .flags = VPORT_F_REQUIRED,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
.get_name = ovs_netdev_get_name,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
.get_name = ovs_netdev_get_name,