svn commit: r194350 - in stable/7/sys: . contrib/pf dev/aic dev/ath/ath_hal

[Dag-Erling Smorgrav]

Author: des
Date: Wed Jun 17 11:40:45 2009
New Revision: 194350
URL: http://svn.freebsd.org/changeset/base/194350

Log:
  merge r192066: redundant assignment.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/aic/aic.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)

Modified: stable/7/sys/dev/aic/aic.c
==============================================================================
--- stable/7/sys/dev/aic/aic.c	Wed Jun 17 11:38:16 2009	(r194349)
+++ stable/7/sys/dev/aic/aic.c	Wed Jun 17 11:40:45 2009	(r194350)
@@ -168,7 +168,7 @@ aic_action(struct cam_sim *sim, union cc
 	}
 	case XPT_SET_TRAN_SETTINGS:
 	{
-		struct ccb_trans_settings *cts = cts = &ccb->cts;
+		struct ccb_trans_settings *cts = &ccb->cts;
 		struct aic_tinfo *ti = &aic->tinfo[ccb->ccb_h.target_id];
 		struct ccb_trans_settings_scsi *scsi =
 		    &cts->proto_specific.scsi;