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 'for-2.6.26' of git://neil.brown.name/md
[pandora-kernel.git]
/
net
/
ax25
/
af_ax25.c
diff --git
a/net/ax25/af_ax25.c
b/net/ax25/af_ax25.c
index
ee9dd83
..
2712544
100644
(file)
--- a/
net/ax25/af_ax25.c
+++ b/
net/ax25/af_ax25.c
@@
-869,7
+869,7
@@
struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)
struct sock *sk;
ax25_cb *ax25, *oax25;
- sk = sk_alloc(
osk->sk_net, PF_AX25, GFP_ATOMIC,
osk->sk_prot);
+ sk = sk_alloc(
sock_net(osk), PF_AX25, GFP_ATOMIC,
osk->sk_prot);
if (sk == NULL)
return NULL;