Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183331
b: refs/heads/master
c: 3100aa9
h: refs/heads/master
i:
  183329: 25503cf
  183327: 3df31f9
v: v3
  • Loading branch information
Octavian Purdila authored and David S. Miller committed Dec 27, 2009
1 parent 621a65f commit 119e9ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8beb9ab6c2df203e8d68cb1f48cf42604a6bed86
refs/heads/master: 3100aa9d74db9c6d8d9a3b6421721fc1aef4728f
5 changes: 1 addition & 4 deletions trunk/net/llc/af_llc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 119e9ba

Please sign in to comment.