projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFRM] SAD info TLV aggregationx
[powerpc.git]
/
net
/
ax25
/
ax25_std_timer.c
diff --git
a/net/ax25/ax25_std_timer.c
b/net/ax25/ax25_std_timer.c
index
a29c480
..
f2f6918
100644
(file)
--- a/
net/ax25/ax25_std_timer.c
+++ b/
net/ax25/ax25_std_timer.c
@@
-14,7
+14,6
@@
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/kernel.h>
-#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
@@
-34,7
+33,7
@@
void ax25_std_heartbeat_expiry(ax25_cb *ax25)
{
struct sock *sk=ax25->sk;
void ax25_std_heartbeat_expiry(ax25_cb *ax25)
{
struct sock *sk=ax25->sk;
-
+
if (sk)
bh_lock_sock(sk);
if (sk)
bh_lock_sock(sk);