svn commit: r189042 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb netatalk

Robert Watson rwatson at FreeBSD.org
Wed Feb 25 06:48:14 PST 2009


Author: rwatson
Date: Wed Feb 25 14:48:13 2009
New Revision: 189042
URL: http://svn.freebsd.org/changeset/base/189042

Log:
  Merge 3188124 from head to stable/7:
  
    Remove local variable 'ddp' from DDP's attach and detach routines; they
    were used only for assertions, and rather than ifdef'ing them
    INVARIANTS and using local variables, just directly access so_pcb.
  
    Submitted by: Christoph Mallon <christoph dot mallon at gmx dot de>

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/netatalk/ddp_usrreq.c

Modified: stable/7/sys/netatalk/ddp_usrreq.c
==============================================================================
--- stable/7/sys/netatalk/ddp_usrreq.c	Wed Feb 25 14:26:16 2009	(r189041)
+++ stable/7/sys/netatalk/ddp_usrreq.c	Wed Feb 25 14:48:13 2009	(r189042)
@@ -75,11 +75,9 @@ static struct ifqueue atintrq1, atintrq2
 static int
 ddp_attach(struct socket *so, int proto, struct thread *td)
 {
-	struct ddpcb *ddp;
 	int error = 0;
 	
-	ddp = sotoddpcb(so);
-	KASSERT(ddp == NULL, ("ddp_attach: ddp != NULL"));
+	KASSERT(sotoddpcb(so) == NULL, ("ddp_attach: ddp != NULL"));
 
 	/*
 	 * Allocate socket buffer space first so that it's present
@@ -175,10 +173,8 @@ ddp_disconnect(struct socket *so)
 static int
 ddp_shutdown(struct socket *so)
 {
-	struct ddpcb	*ddp;
 
-	ddp = sotoddpcb(so);
-	KASSERT(ddp != NULL, ("ddp_shutdown: ddp == NULL"));
+	KASSERT(sotoddpcb(so) != NULL, ("ddp_shutdown: ddp == NULL"));
 
 	socantsendmore(so);
 	return (0);


More information about the svn-src-stable mailing list