Print this page
8649 SD_RESET_THROTTLE_TIMEOUT is defined twice
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/sys/scsi/targets/sddef.h
          +++ new/usr/src/uts/common/sys/scsi/targets/sddef.h
↓ open down ↓ 1738 lines elided ↑ open up ↑
1739 1739   * 100 msec. is what we'll wait for certain retries for fibre channel
1740 1740   * targets, 0 msec for parallel SCSI.
1741 1741   */
1742 1742  #if defined(__fibre)
1743 1743  #define SD_RETRY_DELAY                  (drv_usectohz(100000))
1744 1744  #else
1745 1745  #define SD_RETRY_DELAY                  ((clock_t)0)
1746 1746  #endif
1747 1747  
1748 1748  /*
1749      - * 60 seconds is what we will wait for to reset the
1750      - * throttle back to it SD_MAX_THROTTLE.
1751      - */
1752      -#define SD_RESET_THROTTLE_TIMEOUT       60
1753      -
1754      -/*
1755 1749   * Number of times we'll retry a normal operation.
1756 1750   *
1757 1751   * This includes retries due to transport failure
1758 1752   * (need to distinguish between Target and Transport failure)
1759 1753   *
1760 1754   */
1761 1755  #if defined(__fibre)
1762 1756  #define SD_RETRY_COUNT                  3
1763 1757  #else
1764 1758  #define SD_RETRY_COUNT                  5
↓ open down ↓ 657 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX