diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
| commit | c18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch) | |
| tree | 57049641755e7e01d6da9a902ac662a28b688b0b /net/ipv6/ip6_gre.c | |
| parent | ALSA: hda - Add support of new codec ALC284 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/wm5100' into tmp (diff) | |
| download | linux-c18ab0bac4c377b22e03f9cd4efafa1316b76552.tar.xz linux-c18ab0bac4c377b22e03f9cd4efafa1316b76552.zip | |
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which
just hadn't worked before, nobody noticed due to lack of use.
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 867466c96aac..c727e4712751 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -758,8 +758,6 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb, skb_dst_set_noref(skb, dst); } - skb->transport_header = skb->network_header; - proto = NEXTHDR_GRE; if (encap_limit >= 0) { init_tel_txopt(&opt, encap_limit); @@ -768,6 +766,7 @@ static netdev_tx_t ip6gre_xmit2(struct sk_buff *skb, skb_push(skb, gre_hlen); skb_reset_network_header(skb); + skb_set_transport_header(skb, sizeof(*ipv6h)); /* * Push down and install the IP header. |