diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/ixgbe/ixgbe_dcb.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_dcb.c')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_dcb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_dcb.c b/drivers/net/ixgbe/ixgbe_dcb.c index 41c529fac0ab..686a17aadef3 100644 --- a/drivers/net/ixgbe/ixgbe_dcb.c +++ b/drivers/net/ixgbe/ixgbe_dcb.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | /** | 36 | /** |
| 37 | * ixgbe_ieee_credits - This calculates the ieee traffic class | 37 | * ixgbe_ieee_credits - This calculates the ieee traffic class |
| 38 | * credits from the configured bandwidth percentages. Credits | 38 | * credits from the configured bandwidth percentages. Credits |
| 39 | * are the smallest unit programable into the underlying | 39 | * are the smallest unit programmable into the underlying |
| 40 | * hardware. The IEEE 802.1Qaz specification do not use bandwidth | 40 | * hardware. The IEEE 802.1Qaz specification do not use bandwidth |
| 41 | * groups so this is much simplified from the CEE case. | 41 | * groups so this is much simplified from the CEE case. |
| 42 | */ | 42 | */ |