From 3164f57cc75db930ba94de4afa7471b26829dbe0 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 10 Jul 2012 07:08:18 -0700 Subject: [PATCH] --- yaml --- r: 315079 b: refs/heads/master c: 312487313d4f7177cb751830e3d9c218e42ed59e h: refs/heads/master i: 315077: 3a527087a40130c84b8f0e6d6c9b8f7fdf980aaa 315075: e9690607059980d4e54ecb8a018f685791856672 315071: 7e6ea40f2cbcc8731a3ee77a04d41c8026204226 v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 30 ++---------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 7ff5b764b88b..dfed8912f500 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2db2d67e4cf6100249bad575d9c13c16fd7b06dc +refs/heads/master: 312487313d4f7177cb751830e3d9c218e42ed59e diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index a967df54a423..9cc00f8a6ee5 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -158,34 +158,8 @@ static void ipv4_dst_ifdown(struct dst_entry *dst, struct net_device *dev, static u32 *ipv4_cow_metrics(struct dst_entry *dst, unsigned long old) { - struct rtable *rt = (struct rtable *) dst; - struct inet_peer *peer; - u32 *p = NULL; - - peer = rt_get_peer_create(rt, rt->rt_dst); - if (peer) { - u32 *old_p = __DST_METRICS_PTR(old); - unsigned long prev, new; - - p = peer->metrics; - if (inet_metrics_new(peer)) - memcpy(p, old_p, sizeof(u32) * RTAX_MAX); - - new = (unsigned long) p; - prev = cmpxchg(&dst->_metrics, old, new); - - if (prev != old) { - p = __DST_METRICS_PTR(prev); - if (prev & DST_METRICS_READ_ONLY) - p = NULL; - } else { - if (rt->fi) { - fib_info_put(rt->fi); - rt->fi = NULL; - } - } - } - return p; + WARN_ON(1); + return NULL; } static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,