git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
include
/
net
/
dst.h
diff --git
a/include/net/dst.h
b/include/net/dst.h
index
2a46cba
..
75b95df
100644
(file)
--- a/
include/net/dst.h
+++ b/
include/net/dst.h
@@
-345,7
+345,7
@@
static inline void skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev)
static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)
{
- struct dst_entry *child =
skb_dst(skb)->child
;
+ struct dst_entry *child =
dst_clone(skb_dst(skb)->child)
;
skb_dst_drop(skb);
return child;