aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2011-05-24 13:29:50 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-24 13:29:50 -0400
commitb30c516f875004f025f4d10147bde28c5e98466b (patch)
tree066a6d57ec1cbdf0bfe7219a57bad1459b89773f /net/core
parent19694ac88d4a73c6f12159d9e53bd636319a69dc (diff)
downloadkernel_samsung_tuna-b30c516f875004f025f4d10147bde28c5e98466b.zip
kernel_samsung_tuna-b30c516f875004f025f4d10147bde28c5e98466b.tar.gz
kernel_samsung_tuna-b30c516f875004f025f4d10147bde28c5e98466b.tar.bz2
net: fix __dst_destroy_metrics_generic()
dst_default_metrics is readonly, we dont want to kfree() it later. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dst.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dst.c b/net/core/dst.c
index 81a4fa1..9ccca03 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -315,7 +315,7 @@ void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old)
{
unsigned long prev, new;
- new = (unsigned long) dst_default_metrics;
+ new = ((unsigned long) dst_default_metrics) | DST_METRICS_READ_ONLY;
prev = cmpxchg(&dst->_metrics, old, new);
if (prev == old)
kfree(__DST_METRICS_PTR(old));