GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tunnels: harmonize cleanup done on skb on rx path

Browse source 
The goal of this patch is to harmonize cleanup done on a skbuff on rx path.
Before this patch, behaviors were different depending of the tunnel type.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2013-09-02 15:34:58 +02:00 • committed by David S. Miller
parent 963a88b31d
commit ea23192e8e
7 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/ipv6/sit.c
View file

@ -581,12 +581,10 @@ static int ipip6_rcv(struct sk_buff *skb)
tunnel->parms.iph.protocol != 0)
goto out;
secpath_reset(skb);
skb->mac_header = skb->network_header;
skb_reset_network_header(skb);
IPCB(skb)->flags = 0;
skb->protocol = htons(ETH_P_IPV6);
skb->pkt_type = PACKET_HOST;
if (tunnel->dev->priv_flags & IFF_ISATAP) {
if (!isatap_chksrc(skb, iph, tunnel)) {
@ -603,7 +601,7 @@ static int ipip6_rcv(struct sk_buff *skb)
}
}
__skb_tunnel_rx(skb, tunnel->dev);
__skb_tunnel_rx(skb, tunnel->dev, tunnel->net);
err = IP_ECN_decapsulate(iph, skb);
if (unlikely(err)) {
@ -621,8 +619,6 @@ static int ipip6_rcv(struct sk_buff *skb)
tstats->rx_packets++;
tstats->rx_bytes += skb->len;
if (!net_eq(tunnel->net, dev_net(tunnel->dev)))
skb_scrub_packet(skb, true);
netif_rx(skb);
return 0;