Re: [PATCH] 2.3.99p6p1: irda doesn't compile

[Jeff Garzik]

This is a multi-part message in MIME format.
--------------5CB0EEAD8CFD73813659B6FF
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

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
--------------5CB0EEAD8CFD73813659B6FF
Content-Type: message/rfc822
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Return-Path: <[e-mail]>
Received: from growl.pobox.com (growl.pobox.com [208.210.124.27])
	by mandrakesoft.mandrakesoft.com (8.8.5/8.8.5) with ESMTP id VAA17668
	for <[e-mail]>; Tue, 11 Apr 2000 21:35:35 -0500
Received: by growl.pobox.com (Postfix, from userid 18)
	id 785664BE9; Tue, 11 Apr 2000 23:10:23 -0400 (EDT)
Received: from nic.funet.fi (nic.funet.fi [193.166.0.145])
	by growl.pobox.com (Postfix) with ESMTP
	id 4F62C4DCF; Tue, 11 Apr 2000 23:10:20 -0400 (EDT)
Received: from vger.rutgers.edu ([128.6.190.2]:5722 "EHLO vger.rutgers.edu"
	ident: "NO-IDENT-SERVICE[2]" smtp-auth: <none> TLS-CIPHER: <none>)
	by nic.funet.fi with ESMTP id <S29595AbQDLDIw>;
	Wed, 12 Apr 2000 06:08:52 +0300
Received: by vger.rutgers.edu via listexpand id <S154767AbQDLDDJ>;
	Tue, 11 Apr 2000 23:03:09 -0400
Received: by vger.rutgers.edu id <S154772AbQDLCoF>;
	Tue, 11 Apr 2000 22:44:05 -0400
Received: from [198.167.161.1] ([198.167.161.1]:12350 "EHLO kiln.isn.net")
	by vger.rutgers.edu with ESMTP id <S154860AbQDLCOC>;
	Tue, 11 Apr 2000 22:14:02 -0400
Received: from isn.net ([e-mail] [216.129.42.71])
	by kiln.isn.net (8.9.3/8.9.3) with ESMTP id XAA18370;
	Tue, 11 Apr 2000 23:11:09 -0300
Message-ID: <[e-mail]>
Date: 	Tue, 11 Apr 2000 23:12:43 -0300
From: "Garst R. Reese" <[e-mail]>
X-Mailer: Mozilla 4.72 [en] (X11; U; Linux 2.3.99-pre4 i586)
X-Accept-Language: en
MIME-Version: 1.0
To: [e-mail], linux-kernel <[e-mail]>
Subject: 2.3.99pre3/4/5 af_irda.c
Content-Type: multipart/mixed;
 boundary="------------50C38654817AE6AF717D75FD"
Sender: [e-mail]
Precedence: bulk
X-Loop: 	[e-mail]
X-Mozilla-Status2: 00000000

This is a multi-part message in MIME format.
--------------50C38654817AE6AF717D75FD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

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
--------------50C38654817AE6AF717D75FD
Content-Type: text/plain; charset=us-ascii;
 name="af_irda.c.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="af_irda.c.diff"

--- 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)

--------------50C38654817AE6AF717D75FD--