diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-26 16:37:08 -0400 |
| commit | b05930f5d1c7d5873cb050261d21789a99de9d48 (patch) | |
| tree | 2d374846712b0bdacc5dd0a36b3c2f754886e560 /net/ipv6/route.c | |
| parent | b65f63ee845136940db985f3072335d8cdb6fd6c (diff) | |
| parent | 41a00f7950a6bc0aa956f6d6b423f0fbf34d431a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/inetdevice.h
The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.
The iwlwifi conflict is a context overlap.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e22c4db8d07a..55236a84c748 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1177,6 +1177,27 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark) } EXPORT_SYMBOL_GPL(ip6_redirect); +void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif, + u32 mark) +{ + const struct ipv6hdr *iph = ipv6_hdr(skb); + const struct rd_msg *msg = (struct rd_msg *)icmp6_hdr(skb); + struct dst_entry *dst; + struct flowi6 fl6; + + memset(&fl6, 0, sizeof(fl6)); + fl6.flowi6_oif = oif; + fl6.flowi6_mark = mark; + fl6.flowi6_flags = 0; + fl6.daddr = msg->dest; + fl6.saddr = iph->daddr; + + dst = ip6_route_output(net, NULL, &fl6); + if (!dst->error) + rt6_do_redirect(dst, NULL, skb); + dst_release(dst); +} + void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk) { ip6_redirect(skb, sock_net(sk), sk->sk_bound_dev_if, sk->sk_mark); |