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
8fc64e3
..
2712544
100644
(file)
--- a/
net/ax25/af_ax25.c
+++ b/
net/ax25/af_ax25.c
@@
-116,7
+116,7
@@
static int ax25_device_event(struct notifier_block *this, unsigned long event,
{
struct net_device *dev = (struct net_device *)ptr;
{
struct net_device *dev = (struct net_device *)ptr;
- if (dev
->nd_net
!= &init_net)
+ if (dev
_net(dev)
!= &init_net)
return NOTIFY_DONE;
/* Reject non AX.25 devices */
return NOTIFY_DONE;
/* Reject non AX.25 devices */
@@
-510,11
+510,7
@@
ax25_cb *ax25_create_cb(void)
skb_queue_head_init(&ax25->ack_queue);
skb_queue_head_init(&ax25->reseq_queue);
skb_queue_head_init(&ax25->ack_queue);
skb_queue_head_init(&ax25->reseq_queue);
- init_timer(&ax25->timer);
- init_timer(&ax25->t1timer);
- init_timer(&ax25->t2timer);
- init_timer(&ax25->t3timer);
- init_timer(&ax25->idletimer);
+ ax25_setup_timers(ax25);
ax25_fillin_cb(ax25, NULL);
ax25_fillin_cb(ax25, NULL);
@@
-873,7
+869,7
@@
struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev)
struct sock *sk;
ax25_cb *ax25, *oax25;
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;
if (sk == NULL)
return NULL;
@@
-1928,12
+1924,10
@@
static int ax25_info_show(struct seq_file *seq, void *v)
ax25->paclen);
if (ax25->sk != NULL) {
ax25->paclen);
if (ax25->sk != NULL) {
- bh_lock_sock(ax25->sk);
- seq_printf(seq," %d %d %ld\n",
+ seq_printf(seq, " %d %d %lu\n",
atomic_read(&ax25->sk->sk_wmem_alloc),
atomic_read(&ax25->sk->sk_rmem_alloc),
atomic_read(&ax25->sk->sk_wmem_alloc),
atomic_read(&ax25->sk->sk_rmem_alloc),
- ax25->sk->sk_socket != NULL ? SOCK_INODE(ax25->sk->sk_socket)->i_ino : 0L);
- bh_unlock_sock(ax25->sk);
+ sock_i_ino(ax25->sk));
} else {
seq_puts(seq, " * * *\n");
}
} else {
seq_puts(seq, " * * *\n");
}