projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Use kfree_skb() only on error paths.
[openvswitch]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index 04f51eb330186ba8c90b5e41be2e1248d7a3a558..a468ac83506212f9b98985bcb3843f3d07b066ef 100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-22,6
+22,10
@@
#include "vport-internal_dev.h"
#include "vport-netdev.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+#define HAVE_NET_DEVICE_OPS
+#endif
+
struct internal_dev {
struct vport *vport;
struct net_device_stats stats;
struct internal_dev {
struct vport *vport;
struct net_device_stats stats;
@@
-32,16
+36,14
@@
static inline struct internal_dev *internal_dev_priv(struct net_device *netdev)
return netdev_priv(netdev);
}
return netdev_priv(netdev);
}
-/* This function is only called by the kernel network layer. It is not a vport
- * get_stats() function. If a vport get_stats() function is defined that
- * results in this being called it will cause infinite recursion. */
+/* This function is only called by the kernel network layer.*/
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev)
{
struct vport *vport = internal_dev_get_vport(netdev);
struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
if (vport) {
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev)
{
struct vport *vport = internal_dev_get_vport(netdev);
struct net_device_stats *stats = &internal_dev_priv(netdev)->stats;
if (vport) {
- struct
rtnl_link_stats64
vport_stats;
+ struct
ovs_vport_stats
vport_stats;
vport_get_stats(vport, &vport_stats);
vport_get_stats(vport, &vport_stats);
@@
-55,7
+57,6
@@
static struct net_device_stats *internal_dev_sys_stats(struct net_device *netdev
stats->tx_errors = vport_stats.rx_errors;
stats->rx_dropped = vport_stats.tx_dropped;
stats->tx_dropped = vport_stats.rx_dropped;
stats->tx_errors = vport_stats.rx_errors;
stats->rx_dropped = vport_stats.tx_dropped;
stats->tx_dropped = vport_stats.rx_dropped;
- stats->collisions = vport_stats.collisions;
}
return stats;
}
return stats;
@@
-71,7
+72,7
@@
static int internal_dev_mac_addr(struct net_device *dev, void *p)
return 0;
}
return 0;
}
-/* Called with rcu_read_lock
and bottom-halves disabled
. */
+/* Called with rcu_read_lock
_bh
. */
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
if (unlikely(compute_ip_summed(skb, true))) {
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
if (unlikely(compute_ip_summed(skb, true))) {
@@
-82,7
+83,9
@@
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
vlan_copy_skb_tci(skb);
OVS_CB(skb)->flow = NULL;
vlan_copy_skb_tci(skb);
OVS_CB(skb)->flow = NULL;
+ rcu_read_lock();
vport_receive(internal_dev_priv(netdev)->vport, skb);
vport_receive(internal_dev_priv(netdev)->vport, skb);
+ rcu_read_unlock();
return 0;
}
return 0;
}
@@
-168,6
+171,7
@@
static void do_setup(struct net_device *netdev)
netdev->change_mtu = internal_dev_change_mtu;
#endif
netdev->change_mtu = internal_dev_change_mtu;
#endif
+ netdev->priv_flags &= ~IFF_TX_SKB_SHARING;
netdev->destructor = internal_dev_destructor;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
netdev->destructor = internal_dev_destructor;
SET_ETHTOOL_OPS(netdev, &internal_dev_ethtool_ops);
netdev->tx_queue_len = 0;
@@
-252,10
+256,7
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
skb->protocol = eth_type_trans(skb, netdev);
forward_ip_summed(skb, false);
skb->protocol = eth_type_trans(skb, netdev);
forward_ip_summed(skb, false);
- if (in_interrupt())
- netif_rx(skb);
- else
- netif_rx_ni(skb);
+ netif_rx(skb);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
netdev->last_rx = jiffies;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
netdev->last_rx = jiffies;
@@
-266,7
+267,7
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
const struct vport_ops internal_vport_ops = {
.type = OVS_VPORT_TYPE_INTERNAL,
const struct vport_ops internal_vport_ops = {
.type = OVS_VPORT_TYPE_INTERNAL,
- .flags = VPORT_F_REQUIRED | VPORT_F_
GEN_STATS | VPORT_F_
FLOW,
+ .flags = VPORT_F_REQUIRED | VPORT_F_FLOW,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
.set_addr = netdev_set_addr,
.create = internal_dev_create,
.destroy = internal_dev_destroy,
.set_addr = netdev_set_addr,