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

[Robert Watson]

Author: rwatson
Date: Mon Mar 16 17:55:24 2009
New Revision: 189893
URL: http://svn.freebsd.org/changeset/base/189893

Log:
  Merge r188545 from head to stable/7:
  
    Remove unused ifaddr and ifreq local variables.

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/cm/smc90cx6.c
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/cm/smc90cx6.c
==============================================================================
--- stable/7/sys/dev/cm/smc90cx6.c	Mon Mar 16 17:46:55 2009	(r189892)
+++ stable/7/sys/dev/cm/smc90cx6.c	Mon Mar 16 17:55:24 2009	(r189893)
@@ -861,14 +861,10 @@ cm_ioctl(ifp, command, data)
 	caddr_t data;
 {
 	struct cm_softc *sc;
-	struct ifaddr *ifa;
-	struct ifreq *ifr;
 	int error;
 
 	error = 0;
 	sc = ifp->if_softc;
-	ifa = (struct ifaddr *)data;
-	ifr = (struct ifreq *)data;
 
 #if defined(CM_DEBUG) && (CM_DEBUG > 2)
 	if_printf(ifp, "ioctl() called, cmd = 0x%lx\n", command);