diff options
author | David S. Miller <davem@davemloft.net> | 2014-06-11 16:02:55 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-11 16:02:55 -0700 |
commit | 902455e00720018d1dbd38327c3fd5bda6d844ee (patch) | |
tree | 02fc906c5bc318220ad4827c6eac2521b9d1fbbf /net/ipv4/ipip.c | |
parent | 39f33367e420d88b3cbbd474e5bcc326338ef324 (diff) | |
parent | c5b46160877a9bb23ab6f96fb666e7766f407704 (diff) | |
download | linux-stable-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.gz linux-stable-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.bz2 linux-stable-902455e00720018d1dbd38327c3fd5bda6d844ee.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/core/rtnetlink.c
net/core/skbuff.c
Both conflicts were very simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
-rw-r--r-- | net/ipv4/ipip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 4bc508f0db90..62eaa005e146 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -149,13 +149,13 @@ static int ipip_err(struct sk_buff *skb, u32 info) if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) { ipv4_update_pmtu(skb, dev_net(skb->dev), info, - t->dev->ifindex, 0, IPPROTO_IPIP, 0); + t->parms.link, 0, IPPROTO_IPIP, 0); err = 0; goto out; } if (type == ICMP_REDIRECT) { - ipv4_redirect(skb, dev_net(skb->dev), t->dev->ifindex, 0, + ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0, IPPROTO_IPIP, 0); err = 0; goto out; |