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/ipv6/sit.c | |
| parent | net/fsl: xgmac_mdio is dependent on OF_MDIO (diff) | |
| parent | net/core: Add VF link state control policy (diff) | |
| download | linux-dev-902455e00720018d1dbd38327c3fd5bda6d844ee.tar.xz linux-dev-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/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index f4380041f5e7..4f408176dc64 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -560,12 +560,12 @@ static int ipip6_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_IPV6, 0); + t->parms.link, 0, IPPROTO_IPV6, 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_IPV6, 0); err = 0; goto out; |