diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-15 21:45:16 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-15 21:45:16 +0400 |
| commit | ad2109d7d258a92fa016f1f36b423bfcc69f7efc (patch) | |
| tree | f1a98ab99b8e80c376b13ac3a82d750ab9b179cf /include/net/ipip.h | |
| parent | cbc200bca4b51a8e2406d4b654d978f8503d430b (diff) | |
| parent | 5cbad7d39ad229c68a724e5e139fd845b93766b2 (diff) | |
| download | linux-ad2109d7d258a92fa016f1f36b423bfcc69f7efc.tar.xz | |
Merge tag 'asoc-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.10
A bunch of changes here, the most interesting one subsystem wise being
Morimoto-san's work to create snd_soc_component which doesn't do much
for now but will be pretty important going forwards:
- Add a new component object type which will form the basis of moving
to a more generic handling of SoC and off-SoC components, contributed
by Kuninori Morimoto.
- A fairly large set of cleanups for the dmaengine integration from
Lars-Peter Clausen, starting to move towards being able to have a
generic driver based on the library.
- Performance optimisations to DAPM from Ryo Tsutsui.
- Support for mixer control sharing in DAPM from Stephen Warren.
- Multiplatform ARM cleanups from Arnd Bergmann.
- New CODEC drivers for AK5385 and TAS5086 from Daniel Mack.
Diffstat (limited to 'include/net/ipip.h')
| -rw-r--r-- | include/net/ipip.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index fd19625ff99d..982141c15200 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h @@ -77,15 +77,11 @@ static inline void tunnel_ip_select_ident(struct sk_buff *skb, { struct iphdr *iph = ip_hdr(skb); - if (iph->frag_off & htons(IP_DF)) - iph->id = 0; - else { - /* Use inner packet iph-id if possible. */ - if (skb->protocol == htons(ETH_P_IP) && old_iph->id) - iph->id = old_iph->id; - else - __ip_select_ident(iph, dst, - (skb_shinfo(skb)->gso_segs ?: 1) - 1); - } + /* Use inner packet iph-id if possible. */ + if (skb->protocol == htons(ETH_P_IP) && old_iph->id) + iph->id = old_iph->id; + else + __ip_select_ident(iph, dst, + (skb_shinfo(skb)->gso_segs ?: 1) - 1); } #endif |