From pmc@citylink.dinoex.sub.de  Sun Dec  4 03:43:43 2011
Return-Path: <pmc@citylink.dinoex.sub.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64FE0106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Dec 2011 03:43:43 +0000 (UTC)
	(envelope-from pmc@citylink.dinoex.sub.de)
Received: from uucp.dinoex.sub.de (uucp.dinoex.sub.de [194.45.71.2])
	by mx1.freebsd.org (Postfix) with ESMTP id B4D208FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Dec 2011 03:43:42 +0000 (UTC)
Received: from uucp.dinoex.sub.de (uucp@uucp.dinoex.sub.de [194.45.71.2] (may be forged))
	by uucp.dinoex.sub.de (8.14.4/8.14.4) with ESMTP id pB43D4c4041385
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 4 Dec 2011 04:13:04 +0100 (CET)
	(envelope-from pmc@citylink.dinoex.sub.de)
Received: from citylink.dinoex.sub.de (uucp@localhost)
	by uucp.dinoex.sub.de (8.14.4/8.14.4/Submit) with UUCP id pB43D4QK041384
	for FreeBSD-gnats-submit@freebsd.org; Sun, 4 Dec 2011 04:13:04 +0100 (CET)
	(envelope-from pmc@citylink.dinoex.sub.de)
Received: from gate.oper.dinoex.org (gate-e [192.168.98.2])
	by citylink.dinoex.sub.de (8.14.5/8.14.5) with ESMTP id pB42E8d3031726
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 4 Dec 2011 03:14:08 +0100 (CET)
	(envelope-from pmc@disp.oper.dinoex.org)
Received: from disp.oper.dinoex.org (disp-e.oper.dinoex.org [192.168.97.18])
	by gate.oper.dinoex.org (8.14.5/8.14.5) with ESMTP id pB42DCa3031609
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 4 Dec 2011 03:13:12 +0100 (CET)
	(envelope-from pmc@disp.oper.dinoex.org)
Received: from disp.oper.dinoex.org (localhost [127.0.0.1])
	by disp.oper.dinoex.org (8.14.5/8.14.5) with ESMTP id pB42B8nY002215
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 4 Dec 2011 03:11:09 +0100 (CET)
	(envelope-from pmc@disp.oper.dinoex.org)
Received: (from pmc@localhost)
	by disp.oper.dinoex.org (8.14.5/8.14.5/Submit) id pB42B8gd002214;
	Sun, 4 Dec 2011 03:11:08 +0100 (CET)
	(envelope-from pmc)
Message-Id: <201112040211.pB42B8gd002214@disp.oper.dinoex.org>
Date: Sun, 4 Dec 2011 03:11:08 +0100 (CET)
From: Peter <pmc@citylink.dinoex.sub.org>
Reply-To: Peter <pmc@citylink.dinoex.sub.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [fix] 'camcontrol nego -D' is ignored
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         163053
>Category:       bin
>Synopsis:       [patch] camcontrol(8): 'camcontrol nego -D' is ignored
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    eadler
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 04 10:13:56 UTC 2011
>Closed-Date:    Wed Jun 06 06:46:55 UTC 2012
>Last-Modified:  Wed Jun 06 06:46:55 UTC 2012
>Originator:     Peter Much
>Release:        FreeBSD 7.4-STABLE i386
>Organization:
n/a
>Environment:
System: FreeBSD disp.oper.dinoex.org 7.4-STABLE FreeBSD 7.4-STABLE #14: Sat Dec 3 20:55:11 CET 2011 root@disp.oper.dinoex.org:/usr/src/sys/i386/compile/D1R74V1 i386

	Seems to be present in Current, too.

>Description:

	The "-D" option to "camcontrol nego" has no actual effect,
	except when applied together with some other option. 

	This is obvious from the (missing) code.

>How-To-Repeat:

	just try it out.

>Fix:

*** sbin/camcontrol/camcontrol.c.orig	Sun Dec  4 03:06:01 2011
--- sbin/camcontrol/camcontrol.c	Sun Dec  4 03:07:01 2011
***************
*** 2734,2739 ****
--- 2734,2740 ----
  				spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
  			else
  				spi->flags |= CTS_SPI_FLAGS_DISC_ENB;
+ 			didsettings++;
  		}
  
  		if (scsi && tag_enable != -1) {
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Sun May 13 22:28:56 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163053 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163053: commit references a PR
Date: Wed, 30 May 2012 03:54:19 +0000 (UTC)

 Author: eadler
 Date: Wed May 30 03:54:10 2012
 New Revision: 236285
 URL: http://svn.freebsd.org/changeset/base/236285
 
 Log:
   Add missing flag enable when certain arguments are parsed
   
   PR:		bin/163053
   Submitted by:	Peter <pmc@citylink.dinoex.sub.org>
   Approved by:	cperciva
   MFC after:	1 week
 
 Modified:
   head/sbin/camcontrol/camcontrol.c
 
 Modified: head/sbin/camcontrol/camcontrol.c
 ==============================================================================
 --- head/sbin/camcontrol/camcontrol.c	Wed May 30 03:51:46 2012	(r236284)
 +++ head/sbin/camcontrol/camcontrol.c	Wed May 30 03:54:10 2012	(r236285)
 @@ -3404,6 +3404,7 @@ ratecontrol(struct cam_device *device, i
  				spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
  			else
  				spi->flags |= CTS_SPI_FLAGS_DISC_ENB;
 +			didsettings++;
  		}
  		if (scsi && tag_enable != -1) {
  			if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0) {
 _______________________________________________
 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-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: eadler 
State-Changed-When: Wed May 30 04:17:06 UTC 2012 
State-Changed-Why:  
committed, awaiting MFC 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163053 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163053: commit references a PR
Date: Wed,  6 Jun 2012 06:35:30 +0000 (UTC)

 Author: eadler
 Date: Wed Jun  6 06:35:09 2012
 New Revision: 236660
 URL: http://svn.freebsd.org/changeset/base/236660
 
 Log:
   MFC r236285:
   	Add missing flag enable when certain arguments are parsed
   
   PR:		bin/163053
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/9/sbin/camcontrol/camcontrol.c
 Directory Properties:
   stable/9/sbin/camcontrol/   (props changed)
 
 Modified: stable/9/sbin/camcontrol/camcontrol.c
 ==============================================================================
 --- stable/9/sbin/camcontrol/camcontrol.c	Wed Jun  6 06:32:50 2012	(r236659)
 +++ stable/9/sbin/camcontrol/camcontrol.c	Wed Jun  6 06:35:09 2012	(r236660)
 @@ -3385,6 +3385,7 @@ ratecontrol(struct cam_device *device, i
  				spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
  			else
  				spi->flags |= CTS_SPI_FLAGS_DISC_ENB;
 +			didsettings++;
  		}
  		if (scsi && tag_enable != -1) {
  			if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0) {
 _______________________________________________
 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-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163053: commit references a PR
Date: Wed,  6 Jun 2012 06:35:47 +0000 (UTC)

 Author: eadler
 Date: Wed Jun  6 06:35:29 2012
 New Revision: 236661
 URL: http://svn.freebsd.org/changeset/base/236661
 
 Log:
   MFC r236285:
   	Add missing flag enable when certain arguments are parsed
   
   PR:		bin/163053
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/8/sbin/camcontrol/camcontrol.c
 Directory Properties:
   stable/8/sbin/camcontrol/   (props changed)
 
 Modified: stable/8/sbin/camcontrol/camcontrol.c
 ==============================================================================
 --- stable/8/sbin/camcontrol/camcontrol.c	Wed Jun  6 06:35:09 2012	(r236660)
 +++ stable/8/sbin/camcontrol/camcontrol.c	Wed Jun  6 06:35:29 2012	(r236661)
 @@ -3321,6 +3321,7 @@ ratecontrol(struct cam_device *device, i
  				spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
  			else
  				spi->flags |= CTS_SPI_FLAGS_DISC_ENB;
 +			didsettings++;
  		}
  		if (scsi && tag_enable != -1) {
  			if ((cpi.hba_inquiry & PI_TAG_ABLE) == 0) {
 _______________________________________________
 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-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163053: commit references a PR
Date: Wed,  6 Jun 2012 06:36:02 +0000 (UTC)

 Author: eadler
 Date: Wed Jun  6 06:35:47 2012
 New Revision: 236662
 URL: http://svn.freebsd.org/changeset/base/236662
 
 Log:
   MFC r236285:
   	Add missing flag enable when certain arguments are parsed
   
   PR:		bin/163053
   Approved by:	cperciva (implicit)
 
 Modified:
   stable/7/sbin/camcontrol/camcontrol.c
 Directory Properties:
   stable/7/sbin/camcontrol/   (props changed)
 
 Modified: stable/7/sbin/camcontrol/camcontrol.c
 ==============================================================================
 --- stable/7/sbin/camcontrol/camcontrol.c	Wed Jun  6 06:35:29 2012	(r236661)
 +++ stable/7/sbin/camcontrol/camcontrol.c	Wed Jun  6 06:35:47 2012	(r236662)
 @@ -2734,6 +2734,7 @@ ratecontrol(struct cam_device *device, i
  				spi->flags &= ~CTS_SPI_FLAGS_DISC_ENB;
  			else
  				spi->flags |= CTS_SPI_FLAGS_DISC_ENB;
 +			didsettings++;
  		}
  
  		if (scsi && tag_enable != -1) {
 _______________________________________________
 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-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: eadler 
State-Changed-When: Wed Jun 6 06:46:54 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163053 
>Unformatted:
