From 119e9ba1a6d19ff4be0f35646acd62af6a2de3d0 Mon Sep 17 00:00:00 2001
From: Octavian Purdila <opurdila@ixiacom.com>
Date: Sat, 26 Dec 2009 11:51:08 +0000
Subject: [PATCH] --- yaml --- r: 183331 b: refs/heads/master c:
 3100aa9d74db9c6d8d9a3b6421721fc1aef4728f h: refs/heads/master i:   183329:
 25503cf3eb1390df9617ae7020705e42f86d7fd2   183327:
 3df31f9e8982b2dbc2aa88cd0978602385e65e8b v: v3

---
 [refs]                 | 2 +-
 trunk/net/llc/af_llc.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 90f2bb450089..32d639993e0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8beb9ab6c2df203e8d68cb1f48cf42604a6bed86
+refs/heads/master: 3100aa9d74db9c6d8d9a3b6421721fc1aef4728f
diff --git a/trunk/net/llc/af_llc.c b/trunk/net/llc/af_llc.c
index f49f3dd6fbd3..e35d907fba2c 100644
--- a/trunk/net/llc/af_llc.c
+++ b/trunk/net/llc/af_llc.c
@@ -197,10 +197,8 @@ static int llc_ui_release(struct socket *sock)
 		llc->laddr.lsap, llc->daddr.lsap);
 	if (!llc_send_disc(sk))
 		llc_ui_wait_for_disc(sk, sk->sk_rcvtimeo);
-	if (!sock_flag(sk, SOCK_ZAPPED)) {
-		llc_sap_put(llc->sap);
+	if (!sock_flag(sk, SOCK_ZAPPED))
 		llc_sap_remove_socket(llc->sap, sk);
-	}
 	release_sock(sk);
 	if (llc->dev)
 		dev_put(llc->dev);
@@ -352,7 +350,6 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
 		rc = -EBUSY; /* some other network layer is using the sap */
 		if (!sap)
 			goto out;
-		llc_sap_hold(sap);
 	} else {
 		struct llc_addr laddr, daddr;
 		struct sock *ask;