Please consider the fix posted to lkml several times by Garst Reese.
His patch seems to follow the style of the other changes much more
correctly. Garst's latest attached below.
Jeff
Bernhard Rosenkraenzer wrote:
>
> af_irda.c hasn't been adapted to the SO_WAITDATA / SO_ACCEPTCON changes.
> Here's a fix.
>
> LLaP
> bero
>
> ------------------------------------------------------------------------
> Name: linux-2.3.99p6p1-compile.patch
> linux-2.3.99p6p1-compile.patch Type: Plain Text (TEXT/PLAIN)
> Encoding: BASE64
> Description: fix
-- Jeff Garzik | Nothing cures insomnia like the Building 1024 | realization that it's time to get up. MandrakeSoft, Inc. | -- random fortune
attached mail follows:
Hi linus, list The attached patch was sent to the dag bratti some time ago, but I guess he's on vacation. It mimics the fix to other af_ files. Garst
--- af_irda.c.99pre4.orig Wed Feb 9 00:12:36 2000 +++ af_irda.c Mon Apr 3 02:31:20 2000 @@ -1212,12 +1212,14 @@ * Sleep until data has arrive. But check for races.. * */ -static void irda_data_wait(struct sock *sk) -{ +static void irda_data_wait(struct socket *sock) +{ struct sock *sk = sock->sk; + if (!skb_peek(&sk->receive_queue)) { - sk->socket->flags |= SO_WAITDATA; + set_bit(SOCK_ASYNC_WAITDATA, &sock->flags); + interruptible_sleep_on(sk->sleep); - sk->socket->flags &= ~SO_WAITDATA; + clear_bit(SOCK_ASYNC_WAITDATA, &sock->flags); } } @@ -1241,7 +1243,7 @@ self = sk->protinfo.irda; ASSERT(self != NULL, return -1;); - if (sock->flags & SO_ACCEPTCON) + if (sock->flags & __SO_ACCEPTCON) return(-EINVAL); if (flags & MSG_OOB)
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Apr 15 2000 - 21:00:22 EST