2.3.99-pre5 irda compile

From: Rob Braun (bbraun@synack.net)
Date: Thu Apr 13 2000 - 19:55:57 EST


linux/net/irda/af_irda.c uses old macro and will not compile
under 2.3.99-pre5. Here is the patch I used to make it compile.

Rob

*** linux/net/irda/af_irda.c Tue Apr 11 00:16:12 2000
--- linux-2.3.99-pre5/net/irda/af_irda.c Sat Jan 6 04:59:41 1990
***************
*** 1215,1223 ****
  static void irda_data_wait(struct sock *sk)
  {
          if (!skb_peek(&sk->receive_queue)) {
! sk->socket->flags |= SO_WAITDATA;
                  interruptible_sleep_on(sk->sleep);
! sk->socket->flags &= ~SO_WAITDATA;
          }
  }
  
--- 1215,1223 ----
  static void irda_data_wait(struct sock *sk)
  {
          if (!skb_peek(&sk->receive_queue)) {
! set_bit(SOCK_ASYNC_WAITDATA, &sk->socket->flags);
                  interruptible_sleep_on(sk->sleep);
! clear_bit(SOCK_ASYNC_WAITDATA, &sk->socket->flags);
          }
  }
  
***************
*** 1241,1247 ****
          self = sk->protinfo.irda;
          ASSERT(self != NULL, return -1;);
  
! if (sock->flags & SO_ACCEPTCON)
                  return(-EINVAL);
  
          if (flags & MSG_OOB)
--- 1241,1247 ----
          self = sk->protinfo.irda;
          ASSERT(self != NULL, return -1;);
  
! 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/



This archive was generated by hypermail 2b29 : Sat Apr 15 2000 - 21:00:23 EST