Author: emax
Date: Fri Feb 13 01:14:00 2009
New Revision: 188547
URL: http://svn.freebsd.org/changeset/base/188547

Log:
  MFC r188452
  
  Update comment. soalloc() is no longer performing M_WAITOK memory allocations.
  
  Submitted by: ru

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c

Modified: stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
==============================================================================
--- stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Fri Feb 13 
00:01:11 2009        (r188546)
+++ stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Fri Feb 13 
01:14:00 2009        (r188547)
@@ -518,13 +518,9 @@ ng_btsocket_rfcomm_connect(struct socket
                return (EDESTADDRREQ);
 
        /*
-        * XXX FIXME - This is FUBAR. socreate() will call soalloc(1), i.e.
-        * soalloc() is allowed to sleep in MALLOC. This creates "could sleep"
-        * WITNESS warnings. To work around this problem we will create L2CAP
-        * socket first and then check if we actually need it. Note that we 
-        * will not check for errors in socreate() because if we failed to 
-        * create L2CAP socket at this point we still might have already open
-        * session.
+        * Note that we will not check for errors in socreate() because
+        * if we failed to create L2CAP socket at this point we still
+        * might have already open session.
         */
 
        error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,
@@ -857,13 +853,9 @@ ng_btsocket_rfcomm_listen(struct socket 
        mtx_unlock(&pcb->pcb_mtx);
 
        /*
-        * XXX FIXME - This is FUBAR. socreate() will call soalloc(1), i.e.
-        * soalloc() is allowed to sleep in MALLOC. This creates "could sleep"
-        * WITNESS warnings. To work around this problem we will create L2CAP
-        * socket first and then check if we actually need it. Note that we 
-        * will not check for errors in socreate() because if we failed to 
-        * create L2CAP socket at this point we still might have already open
-        * session.
+        * Note that we will not check for errors in socreate() because
+        * if we failed to create L2CAP socket at this point we still
+        * might have already open session.
         */
 
        socreate_error = socreate(PF_BLUETOOTH, &l2so, SOCK_SEQPACKET,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to