| Submitter | Pravin B Shelar |
|---|---|
| Date | Feb. 22, 2013, 5:30 p.m. |
| Message ID | <1361554240-1678-1-git-send-email-pshelar@nicira.com> |
| Download | mbox | patch |
| Permalink | /patch/222662/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Pravin B Shelar <pshelar@nicira.com> Date: Fri, 22 Feb 2013 09:30:40 -0800 > tunnel_ip_select_ident() is more efficient when generating ip-header > id given inner packet is of ipv4 type. > > Signed-off-by: Pravin B Shelar <pshelar@nicira.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 9d70421..f736823 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -33,6 +33,7 @@ #include <net/arp.h> #include <net/ndisc.h> #include <net/ip.h> +#include <net/ipip.h> #include <net/icmp.h> #include <net/udp.h> #include <net/rtnetlink.h> @@ -962,13 +963,13 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) iph->daddr = dst; iph->saddr = fl4.saddr; iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); + tunnel_ip_select_ident(skb, old_iph, &rt->dst); vxlan_set_owner(dev, skb); /* See iptunnel_xmit() */ if (skb->ip_summed != CHECKSUM_PARTIAL) skb->ip_summed = CHECKSUM_NONE; - ip_select_ident(iph, &rt->dst, NULL); err = ip_local_out(skb); if (likely(net_xmit_eval(err) == 0)) {
tunnel_ip_select_ident() is more efficient when generating ip-header id given inner packet is of ipv4 type. Signed-off-by: Pravin B Shelar <pshelar@nicira.com> --- drivers/net/vxlan.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)