summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBernard Pidoux F6BVP <f6bvp@free.fr>2010-08-26 13:40:00 +0200
committerDavid S. Miller <davem@davemloft.net>2010-08-27 00:18:27 +0200
commitd71b0e9c0028f3af910226f995e0074873e16979 (patch)
treefea5f89a292a0acbcb696d7e5c4005f46e3f5dd8 /net
parentqlge: reset the chip before freeing the buffers (diff)
downloadlinux-d71b0e9c0028f3af910226f995e0074873e16979.tar.xz
linux-d71b0e9c0028f3af910226f995e0074873e16979.zip
ax25: missplaced sock_put(sk)
This patch moves a missplaced sock_put(sk) after bh_unlock_sock(sk) like in other parts of AX25 driver. Signed-off-by: Bernard Pidoux <f6bvp@free.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ax25/ax25_ds_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c
index 2ce79df00680..c7d81436213d 100644
--- a/net/ax25/ax25_ds_timer.c
+++ b/net/ax25/ax25_ds_timer.c
@@ -112,8 +112,8 @@ void ax25_ds_heartbeat_expiry(ax25_cb *ax25)
if (sk) {
sock_hold(sk);
ax25_destroy_socket(ax25);
- sock_put(sk);
bh_unlock_sock(sk);
+ sock_put(sk);
} else
ax25_destroy_socket(ax25);
return;