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/vmxnet3/vmxnet3_drv.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/vmxnet3/vmxnet3_drv.c')
| -rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index cc14b4a75048..0d47c3a05307 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
| @@ -892,7 +892,7 @@ vmxnet3_prepare_tso(struct sk_buff *skb, | |||
| 892 | * Transmits a pkt thru a given tq | 892 | * Transmits a pkt thru a given tq |
| 893 | * Returns: | 893 | * Returns: |
| 894 | * NETDEV_TX_OK: descriptors are setup successfully | 894 | * NETDEV_TX_OK: descriptors are setup successfully |
| 895 | * NETDEV_TX_OK: error occured, the pkt is dropped | 895 | * NETDEV_TX_OK: error occurred, the pkt is dropped |
| 896 | * NETDEV_TX_BUSY: tx ring is full, queue is stopped | 896 | * NETDEV_TX_BUSY: tx ring is full, queue is stopped |
| 897 | * | 897 | * |
| 898 | * Side-effects: | 898 | * Side-effects: |
| @@ -2685,7 +2685,7 @@ vmxnet3_read_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac) | |||
| 2685 | * Enable MSIx vectors. | 2685 | * Enable MSIx vectors. |
| 2686 | * Returns : | 2686 | * Returns : |
| 2687 | * 0 on successful enabling of required vectors, | 2687 | * 0 on successful enabling of required vectors, |
| 2688 | * VMXNET3_LINUX_MIN_MSIX_VECT when only minumum number of vectors required | 2688 | * VMXNET3_LINUX_MIN_MSIX_VECT when only minimum number of vectors required |
| 2689 | * could be enabled. | 2689 | * could be enabled. |
| 2690 | * number of vectors which can be enabled otherwise (this number is smaller | 2690 | * number of vectors which can be enabled otherwise (this number is smaller |
| 2691 | * than VMXNET3_LINUX_MIN_MSIX_VECT) | 2691 | * than VMXNET3_LINUX_MIN_MSIX_VECT) |