mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-15 21:30:43 +00:00
tunnel: use iptunnel_xmit() again
With recent patches from Pravin, most tunnels can't use iptunnel_xmit() any more, due to ip_select_ident() and skb->ip_summed. But we can just move these operations out of iptunnel_xmit(), so that tunnels can use it again. This by the way fixes a bug in vxlan (missing nf_reset()) for net-next. Cc: Pravin B Shelar <pshelar@nicira.com> Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4f3ed9209f
commit
6aed0c8bf7
@ -855,7 +855,6 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
__u16 src_port;
|
||||
__be16 df = 0;
|
||||
__u8 tos, ttl;
|
||||
int err;
|
||||
bool did_rsc = false;
|
||||
const struct vxlan_fdb *f;
|
||||
|
||||
@ -980,18 +979,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
if (handle_offloads(skb))
|
||||
goto drop;
|
||||
|
||||
err = ip_local_out(skb);
|
||||
if (likely(net_xmit_eval(err) == 0)) {
|
||||
struct vxlan_stats *stats = this_cpu_ptr(vxlan->stats);
|
||||
|
||||
u64_stats_update_begin(&stats->syncp);
|
||||
stats->tx_packets++;
|
||||
stats->tx_bytes += pkt_len;
|
||||
u64_stats_update_end(&stats->syncp);
|
||||
} else {
|
||||
dev->stats.tx_errors++;
|
||||
dev->stats.tx_aborted_errors++;
|
||||
}
|
||||
iptunnel_xmit(skb, dev);
|
||||
return NETDEV_TX_OK;
|
||||
|
||||
drop:
|
||||
|
@ -51,13 +51,10 @@ struct ip_tunnel_prl_entry {
|
||||
static inline void iptunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
int err;
|
||||
struct iphdr *iph = ip_hdr(skb);
|
||||
int pkt_len = skb->len - skb_transport_offset(skb);
|
||||
struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats);
|
||||
|
||||
nf_reset(skb);
|
||||
skb->ip_summed = CHECKSUM_NONE;
|
||||
ip_select_ident(iph, skb_dst(skb), NULL);
|
||||
|
||||
err = ip_local_out(skb);
|
||||
if (likely(net_xmit_eval(err) == 0)) {
|
||||
|
@ -762,7 +762,6 @@ error:
|
||||
|
||||
static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats);
|
||||
struct ip_tunnel *tunnel = netdev_priv(dev);
|
||||
const struct iphdr *old_iph;
|
||||
const struct iphdr *tiph;
|
||||
@ -778,7 +777,6 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
|
||||
int mtu;
|
||||
u8 ttl;
|
||||
int err;
|
||||
int pkt_len;
|
||||
|
||||
skb = handle_offloads(tunnel, skb);
|
||||
if (IS_ERR(skb)) {
|
||||
@ -1022,19 +1020,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
|
||||
}
|
||||
}
|
||||
|
||||
nf_reset(skb);
|
||||
|
||||
pkt_len = skb->len - skb_transport_offset(skb);
|
||||
err = ip_local_out(skb);
|
||||
if (likely(net_xmit_eval(err) == 0)) {
|
||||
u64_stats_update_begin(&tstats->syncp);
|
||||
tstats->tx_bytes += pkt_len;
|
||||
tstats->tx_packets++;
|
||||
u64_stats_update_end(&tstats->syncp);
|
||||
} else {
|
||||
dev->stats.tx_errors++;
|
||||
dev->stats.tx_aborted_errors++;
|
||||
}
|
||||
iptunnel_xmit(skb, dev);
|
||||
return NETDEV_TX_OK;
|
||||
|
||||
#if IS_ENABLED(CONFIG_IPV6)
|
||||
|
@ -478,8 +478,6 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
__be32 dst = tiph->daddr;
|
||||
struct flowi4 fl4;
|
||||
int mtu;
|
||||
int err;
|
||||
int pkt_len;
|
||||
|
||||
if (skb->protocol != htons(ETH_P_IP))
|
||||
goto tx_error;
|
||||
@ -600,21 +598,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
if ((iph->ttl = tiph->ttl) == 0)
|
||||
iph->ttl = old_iph->ttl;
|
||||
|
||||
nf_reset(skb);
|
||||
|
||||
pkt_len = skb->len - skb_transport_offset(skb);
|
||||
err = ip_local_out(skb);
|
||||
if (likely(net_xmit_eval(err) == 0)) {
|
||||
struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats);
|
||||
|
||||
u64_stats_update_begin(&tstats->syncp);
|
||||
tstats->tx_bytes += pkt_len;
|
||||
tstats->tx_packets++;
|
||||
u64_stats_update_end(&tstats->syncp);
|
||||
} else {
|
||||
dev->stats.tx_errors++;
|
||||
dev->stats.tx_aborted_errors++;
|
||||
}
|
||||
iptunnel_xmit(skb, dev);
|
||||
|
||||
return NETDEV_TX_OK;
|
||||
|
||||
|
@ -899,6 +899,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
|
||||
if ((iph->ttl = tiph->ttl) == 0)
|
||||
iph->ttl = iph6->hop_limit;
|
||||
|
||||
skb->ip_summed = CHECKSUM_NONE;
|
||||
ip_select_ident(iph, skb_dst(skb), NULL);
|
||||
iptunnel_xmit(skb, dev);
|
||||
return NETDEV_TX_OK;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user