From 66b02d0dccfe7935cbad32a3757fc8af11c8d507 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 1 Jul 2010 23:48:22 +0000 Subject: [PATCH] --- yaml --- r: 203371 b: refs/heads/master c: fe76cda3081b502986f0c8b28b0cf8bfc27d44d5 h: refs/heads/master i: 203369: 3645eaac6953b00ae5b582bc70c46855a3056e9f 203367: 261f9dc602d78a8c739c4ce4a62d8399160e24c0 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d0ecfa51112..6392f4cbe695 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a99db196db1166a2159add4a3013e5df0ea126fa +refs/heads/master: fe76cda3081b502986f0c8b28b0cf8bfc27d44d5 diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index 7d1f4b4481a9..d6478521128e 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -411,7 +411,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) to->priority = from->priority; to->protocol = from->protocol; skb_dst_drop(to); - skb_dst_set(to, dst_clone(skb_dst(from))); + skb_dst_copy(to, from); to->dev = from->dev; to->mark = from->mark;