diff options
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 06e7cdaeedc5..ae652ca14bc9 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -465,7 +465,6 @@ static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from) | |||
465 | to->pkt_type = from->pkt_type; | 465 | to->pkt_type = from->pkt_type; |
466 | to->priority = from->priority; | 466 | to->priority = from->priority; |
467 | to->protocol = from->protocol; | 467 | to->protocol = from->protocol; |
468 | to->security = from->security; | ||
469 | dst_release(to->dst); | 468 | dst_release(to->dst); |
470 | to->dst = dst_clone(from->dst); | 469 | to->dst = dst_clone(from->dst); |
471 | to->dev = from->dev; | 470 | to->dev = from->dev; |
@@ -793,13 +792,8 @@ int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl) | |||
793 | if (ipv6_addr_any(&fl->fl6_src)) { | 792 | if (ipv6_addr_any(&fl->fl6_src)) { |
794 | err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src); | 793 | err = ipv6_get_saddr(*dst, &fl->fl6_dst, &fl->fl6_src); |
795 | 794 | ||
796 | if (err) { | 795 | if (err) |
797 | #if IP6_DEBUG >= 2 | ||
798 | printk(KERN_DEBUG "ip6_dst_lookup: " | ||
799 | "no available source address\n"); | ||
800 | #endif | ||
801 | goto out_err_release; | 796 | goto out_err_release; |
802 | } | ||
803 | } | 797 | } |
804 | 798 | ||
805 | return 0; | 799 | return 0; |