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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
net
/
decnet
/
dn_table.c
diff --git
a/net/decnet/dn_table.c
b/net/decnet/dn_table.c
index
e09d915
..
3a2830a
100644
(file)
--- a/
net/decnet/dn_table.c
+++ b/
net/decnet/dn_table.c
@@
-463,7
+463,7
@@
static int dn_fib_table_dump(struct dn_fib_table *tb, struct sk_buff *skb,
int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)
{
- struct net *net = s
kb->sk->sk_net
;
+ struct net *net = s
ock_net(skb->sk)
;
unsigned int h, s_h;
unsigned int e = 0, s_e;
struct dn_fib_table *tb;