diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-05-27 15:16:53 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-05-27 15:16:53 (GMT) |
| commit | eb4606e64a7d548f5d60a9583baa8104890b2c6e (patch) | |
| tree | 2dc8e587fc79c207dab2fb74830963cc84dcf801 /net/ipv4/ip_gre.c | |
| parent | 86c72d1ce91d804e4fa8d90b316a89597dd220f1 (diff) | |
| parent | bf65921380cd50b87618df550398e06581f4a361 (diff) | |
| download | linux-eb4606e64a7d548f5d60a9583baa8104890b2c6e.tar.xz | |
Merge tag 'asoc-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.7 part 2
Really sorry about this late pull request. It looks like at the time I
sent my pull request for v4.7 there was some conflict or other issue
which caused my script to stop merging the ASoC branches at some point
after the HDMI changes.
It's all specific driver updates, including:
- New drivers for MAX98371 and TAS5720.
- SPI support for TLV320AIC32x4.
- TDM support for STI Uniperf IPs.
This code should all have been in -next prior to the merge window apart
from some fixes, it dropped out on the 18th.
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 205a2b8..4cc8421 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -398,7 +398,10 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) iph->saddr, iph->daddr, tpi->key); if (tunnel) { - skb_pop_mac_header(skb); + if (tunnel->dev->type != ARPHRD_NONE) + skb_pop_mac_header(skb); + else + skb_reset_mac_header(skb); if (tunnel->collect_md) { __be16 flags; __be64 tun_id; @@ -1031,6 +1034,8 @@ static void ipgre_netlink_parms(struct net_device *dev, struct ip_tunnel *t = netdev_priv(dev); t->collect_md = true; + if (dev->type == ARPHRD_IPGRE) + dev->type = ARPHRD_NONE; } } |