diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:38 -0500 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-23 23:57:38 -0500 | 
| commit | e51a08b8df461919451b1a2bf4a730da0b994425 (patch) | |
| tree | f3db0334e66ecad72af35d47efac4f1a24edb736 /net/openvswitch/vport-geneve.c | |
| parent | ceb8d5bf17d366534f32d2f60f41d905a5bc864b (diff) | |
| parent | 74f47278cb056ffe1d261df3e094d608c3569829 (diff) | |
Merge branch 'openvswitch-net'
Pravin B Shelar says:
====================
openvswitch: datapath fixes
Following patch series is mostly targeted to MPLS fixes. other
patches are related datapth transmit path error handling.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-geneve.c')
| -rw-r--r-- | net/openvswitch/vport-geneve.c | 3 | 
1 files changed, 3 insertions, 0 deletions
diff --git a/net/openvswitch/vport-geneve.c b/net/openvswitch/vport-geneve.c index 347fa2325b22..484864dd0e68 100644 --- a/net/openvswitch/vport-geneve.c +++ b/net/openvswitch/vport-geneve.c @@ -219,7 +219,10 @@ static int geneve_tnl_send(struct vport *vport, struct sk_buff *skb)  			      false);  	if (err < 0)  		ip_rt_put(rt); +	return err; +  error: +	kfree_skb(skb);  	return err;  }  | 
