diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /drivers/net/bnx2x/bnx2x.h | |
| parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
| parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'drivers/net/bnx2x/bnx2x.h')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 1914026a7b63..50d1e0793091 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h | |||
| @@ -1631,19 +1631,23 @@ static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms, | |||
| 1631 | #define BNX2X_BTR 4 | 1631 | #define BNX2X_BTR 4 |
| 1632 | #define MAX_SPQ_PENDING 8 | 1632 | #define MAX_SPQ_PENDING 8 |
| 1633 | 1633 | ||
| 1634 | 1634 | /* CMNG constants, as derived from system spec calculations */ | |
| 1635 | /* CMNG constants | 1635 | /* default MIN rate in case VNIC min rate is configured to zero - 100Mbps */ |
| 1636 | derived from lab experiments, and not from system spec calculations !!! */ | 1636 | #define DEF_MIN_RATE 100 |
| 1637 | #define DEF_MIN_RATE 100 | ||
| 1638 | /* resolution of the rate shaping timer - 100 usec */ | 1637 | /* resolution of the rate shaping timer - 100 usec */ |
| 1639 | #define RS_PERIODIC_TIMEOUT_USEC 100 | 1638 | #define RS_PERIODIC_TIMEOUT_USEC 100 |
| 1640 | /* resolution of fairness algorithm in usecs - | ||
| 1641 | coefficient for calculating the actual t fair */ | ||
| 1642 | #define T_FAIR_COEF 10000000 | ||
| 1643 | /* number of bytes in single QM arbitration cycle - | 1639 | /* number of bytes in single QM arbitration cycle - |
| 1644 | coefficient for calculating the fairness timer */ | 1640 | * coefficient for calculating the fairness timer */ |
| 1645 | #define QM_ARB_BYTES 40000 | 1641 | #define QM_ARB_BYTES 160000 |
| 1646 | #define FAIR_MEM 2 | 1642 | /* resolution of Min algorithm 1:100 */ |
| 1643 | #define MIN_RES 100 | ||
| 1644 | /* how many bytes above threshold for the minimal credit of Min algorithm*/ | ||
| 1645 | #define MIN_ABOVE_THRESH 32768 | ||
| 1646 | /* Fairness algorithm integration time coefficient - | ||
| 1647 | * for calculating the actual Tfair */ | ||
| 1648 | #define T_FAIR_COEF ((MIN_ABOVE_THRESH + QM_ARB_BYTES) * 8 * MIN_RES) | ||
| 1649 | /* Memory of fairness algorithm . 2 cycles */ | ||
| 1650 | #define FAIR_MEM 2 | ||
| 1647 | 1651 | ||
| 1648 | 1652 | ||
| 1649 | #define ATTN_NIG_FOR_FUNC (1L << 8) | 1653 | #define ATTN_NIG_FOR_FUNC (1L << 8) |