projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Rename "private.h" to "ofproto->provider.h".
[openvswitch]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index fff4f4e596797b598da008c3e9d82f0a456d9e9d..5b3b2b3db7014448a2d677c6c73124996347dee7 100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-6,6
+6,7
@@
* kernel, by Linus Torvalds and others.
*/
* kernel, by Linus Torvalds and others.
*/
+#include <linux/hardirq.h>
#include <linux/if_vlan.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/if_vlan.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
@@
-73,7
+74,11
@@
static int internal_dev_mac_addr(struct net_device *dev, void *p)
/* Called with rcu_read_lock and bottom-halves disabled. */
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
/* Called with rcu_read_lock and bottom-halves disabled. */
static int internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev)
{
- compute_ip_summed(skb, true);
+ if (unlikely(compute_ip_summed(skb, true))) {
+ kfree_skb(skb);
+ return 0;
+ }
+
vlan_copy_skb_tci(skb);
OVS_CB(skb)->flow = NULL;
vlan_copy_skb_tci(skb);
OVS_CB(skb)->flow = NULL;
@@
-252,6
+257,7
@@
static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
skb->dev = netdev;
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);
skb->dev = netdev;
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);
+ forward_ip_summed(skb, false);
if (in_interrupt())
netif_rx(skb);
if (in_interrupt())
netif_rx(skb);