diff options
| author |   Jiri Benc <jbenc@redhat.com> | 2016-02-18 11:22:52 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-02-18 14:34:54 -0500 |
| commit | 7f290c94352e59b1d720055fce760a69a63bd0a1 (patch) | |
| tree | f6c595f28145dc17d4dd983c0e0d64c19e1ebbfd /drivers/net/vxlan.c | |
| parent | vxlan: move vxlan device lookup before iptunnel_pull_header (diff) | |
| download | linux-dev-7f290c94352e59b1d720055fce760a69a63bd0a1.tar.xz linux-dev-7f290c94352e59b1d720055fce760a69a63bd0a1.zip | |
iptunnel: scrub packet in iptunnel_pull_header
Part of skb_scrub_packet was open coded in iptunnel_pull_header. Let it call
skb_scrub_packet directly instead.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 16a176cd0dad..c963897e713d 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1198,7 +1198,6 @@ static void vxlan_rcv(struct vxlan_dev *vxlan, struct vxlan_sock *vs, int err = 0; skb_reset_mac_header(skb); - skb_scrub_packet(skb, !net_eq(vxlan->net, dev_net(vxlan->dev))); skb->protocol = eth_type_trans(skb, vxlan->dev); skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); @@ -1305,7 +1304,8 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) if (!vxlan) goto drop; - if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB))) + if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB), + !net_eq(vxlan->net, dev_net(vxlan->dev)))) goto drop; if (vxlan_collect_metadata(vs)) { |