projects
/
cascardo
/
linux.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/steve/gfs2-2.6-nmw
[cascardo/linux.git]
/
net
/
ax25
/
af_ax25.c
diff --git
a/net/ax25/af_ax25.c
b/net/ax25/af_ax25.c
index
97eaa23
..
28c7157
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_net(dev) != &init_net
)
+ if (
!net_eq(dev_net(dev), &init_net)
)
return NOTIFY_DONE;
/* Reject non AX.25 devices */
return NOTIFY_DONE;
/* Reject non AX.25 devices */
@@
-317,6
+317,9
@@
void ax25_destroy_socket(ax25_cb *ax25)
/* Queue the unaccepted socket for death */
sock_orphan(skb->sk);
/* Queue the unaccepted socket for death */
sock_orphan(skb->sk);
+ /* 9A4GL: hack to release unaccepted sockets */
+ skb->sk->sk_state = TCP_LISTEN;
+
ax25_start_heartbeat(sax25);
sax25->state = AX25_STATE_0;
}
ax25_start_heartbeat(sax25);
sax25->state = AX25_STATE_0;
}