diff options
Diffstat (limited to 'net/irda/af_irda.c')
-rw-r--r-- | net/irda/af_irda.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 7e1aea89ef05..eabd6838f50a 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c | |||
@@ -138,7 +138,7 @@ static void irda_disconnect_indication(void *instance, void *sap, | |||
138 | sk->sk_shutdown |= SEND_SHUTDOWN; | 138 | sk->sk_shutdown |= SEND_SHUTDOWN; |
139 | 139 | ||
140 | sk->sk_state_change(sk); | 140 | sk->sk_state_change(sk); |
141 | sock_orphan(sk); | 141 | sock_orphan(sk); |
142 | release_sock(sk); | 142 | release_sock(sk); |
143 | 143 | ||
144 | /* Close our TSAP. | 144 | /* Close our TSAP. |
@@ -158,7 +158,7 @@ static void irda_disconnect_indication(void *instance, void *sap, | |||
158 | irttp_close_tsap(self->tsap); | 158 | irttp_close_tsap(self->tsap); |
159 | self->tsap = NULL; | 159 | self->tsap = NULL; |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | /* Note : once we are there, there is not much you want to do | 163 | /* Note : once we are there, there is not much you want to do |
164 | * with the socket anymore, apart from closing it. | 164 | * with the socket anymore, apart from closing it. |
@@ -1211,7 +1211,7 @@ static int irda_release(struct socket *sock) | |||
1211 | 1211 | ||
1212 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 1212 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); |
1213 | 1213 | ||
1214 | if (sk == NULL) | 1214 | if (sk == NULL) |
1215 | return 0; | 1215 | return 0; |
1216 | 1216 | ||
1217 | lock_sock(sk); | 1217 | lock_sock(sk); |
@@ -1259,7 +1259,7 @@ static int irda_release(struct socket *sock) | |||
1259 | * memory leak is now gone... - Jean II | 1259 | * memory leak is now gone... - Jean II |
1260 | */ | 1260 | */ |
1261 | 1261 | ||
1262 | return 0; | 1262 | return 0; |
1263 | } | 1263 | } |
1264 | 1264 | ||
1265 | /* | 1265 | /* |
@@ -1312,7 +1312,7 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
1312 | len = self->max_data_size; | 1312 | len = self->max_data_size; |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | skb = sock_alloc_send_skb(sk, len + self->max_header_size + 16, | 1315 | skb = sock_alloc_send_skb(sk, len + self->max_header_size + 16, |
1316 | msg->msg_flags & MSG_DONTWAIT, &err); | 1316 | msg->msg_flags & MSG_DONTWAIT, &err); |
1317 | if (!skb) | 1317 | if (!skb) |
1318 | return -ENOBUFS; | 1318 | return -ENOBUFS; |
@@ -1714,7 +1714,7 @@ static int irda_shutdown(struct socket *sock, int how) | |||
1714 | self->daddr = DEV_ADDR_ANY; /* Until we get re-connected */ | 1714 | self->daddr = DEV_ADDR_ANY; /* Until we get re-connected */ |
1715 | self->saddr = 0x0; /* so IrLMP assign us any link */ | 1715 | self->saddr = 0x0; /* so IrLMP assign us any link */ |
1716 | 1716 | ||
1717 | return 0; | 1717 | return 0; |
1718 | } | 1718 | } |
1719 | 1719 | ||
1720 | /* | 1720 | /* |