* - skb->csum does not include the inner Ethernet header.
* - The layer pointers are undefined.
*/
-void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb)
+void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb,
+ struct ovs_key_ipv4_tunnel *tun_key)
{
struct ethhdr *eh;
return;
}
- ovs_vport_receive(vport, skb);
+ ovs_vport_receive(vport, skb, tun_key);
}
static struct rtable *find_route(struct net *net,
nskb = __skb_gso_segment(skb, 0, false);
if (IS_ERR(nskb)) {
- kfree_skb(skb);
err = PTR_ERR(nskb);
goto error;
}
if (unlikely(need_linearize(skb))) {
err = __skb_linearize(skb);
if (unlikely(err))
- goto error_free;
+ goto error;
}
err = skb_checksum_help(skb);
if (unlikely(err))
- goto error_free;
+ goto error;
}
set_ip_summed(skb, OVS_CSUM_NONE);
return skb;
-error_free:
- kfree_skb(skb);
error:
return ERR_PTR(err);
}
struct rtable *rt;
__be32 saddr;
int sent_len = 0;
+ int err;
+ struct sk_buff *nskb;
/* Route lookup */
saddr = OVS_CB(skb)->tun_key->ipv4_src;
ipproto,
OVS_CB(skb)->tun_key->ipv4_tos,
skb_get_mark(skb));
- if (IS_ERR(rt))
- goto error_free;
+ if (IS_ERR(rt)) {
+ err = PTR_ERR(rt);
+ goto error;
+ }
tunnel_hlen += sizeof(struct iphdr);
+ (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
if (skb_headroom(skb) < min_headroom || skb_header_cloned(skb)) {
- int err;
int head_delta = SKB_DATA_ALIGN(min_headroom -
skb_headroom(skb) +
16);
}
/* Offloading */
- skb = handle_offloads(skb);
- if (IS_ERR(skb)) {
- skb = NULL;
+ nskb = handle_offloads(skb);
+ if (IS_ERR(nskb)) {
+ err = PTR_ERR(nskb);
goto err_free_rt;
}
+ skb = nskb;
/* Reset SKB */
nf_reset(skb);
struct sk_buff *next_skb = skb->next;
struct iphdr *iph;
int frag_len;
- int err;
skb->next = NULL;
skb = next_skb;
}
- if (unlikely(sent_len == 0))
- ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);
-
return sent_len;
err_free_rt:
ip_rt_put(rt);
-error_free:
- kfree_skb(skb);
- ovs_vport_record_error(vport, VPORT_E_TX_ERROR);
- return sent_len;
+error:
+ return err;
}