diff options
author | Scott Feldman <scofeldm@cisco.com> | 2008-11-22 00:29:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-22 00:29:25 -0500 |
commit | 21fc578dcaa66dd30bad3c2f2cd7578e2865e8f2 (patch) | |
tree | d489df6cd83a4cc1cf3558898747404660c690a9 | |
parent | 845964515a76381e204d3399af82c149f8abcc1c (diff) |
enic: misc cleanup items:
Clarrify reading PBA has no side-effect (clearing).
Add missing GPL license text.
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/enic/vnic_intr.h | 2 | ||||
-rw-r--r-- | drivers/net/enic/vnic_resource.h | 2 | ||||
-rw-r--r-- | drivers/net/enic/vnic_rss.h | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/enic/vnic_intr.h index ccc408116af8..ce633a5a7e3c 100644 --- a/drivers/net/enic/vnic_intr.h +++ b/drivers/net/enic/vnic_intr.h | |||
@@ -78,7 +78,7 @@ static inline void vnic_intr_return_credits(struct vnic_intr *intr, | |||
78 | 78 | ||
79 | static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba) | 79 | static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba) |
80 | { | 80 | { |
81 | /* get and ack interrupt in one read (clear-and-ack-on-read) */ | 81 | /* read PBA without clearing */ |
82 | return ioread32(legacy_pba); | 82 | return ioread32(legacy_pba); |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/enic/vnic_resource.h index 144d2812f081..b61c22aec41a 100644 --- a/drivers/net/enic/vnic_resource.h +++ b/drivers/net/enic/vnic_resource.h | |||
@@ -38,7 +38,7 @@ enum vnic_res_type { | |||
38 | RES_TYPE_INTR_CTRL, /* Interrupt ctrl table */ | 38 | RES_TYPE_INTR_CTRL, /* Interrupt ctrl table */ |
39 | RES_TYPE_INTR_TABLE, /* MSI/MSI-X Interrupt table */ | 39 | RES_TYPE_INTR_TABLE, /* MSI/MSI-X Interrupt table */ |
40 | RES_TYPE_INTR_PBA, /* MSI/MSI-X PBA table */ | 40 | RES_TYPE_INTR_PBA, /* MSI/MSI-X PBA table */ |
41 | RES_TYPE_INTR_PBA_LEGACY, /* Legacy intr status, r2c */ | 41 | RES_TYPE_INTR_PBA_LEGACY, /* Legacy intr status */ |
42 | RES_TYPE_RSVD6, | 42 | RES_TYPE_RSVD6, |
43 | RES_TYPE_RSVD7, | 43 | RES_TYPE_RSVD7, |
44 | RES_TYPE_DEVCMD, /* Device command region */ | 44 | RES_TYPE_DEVCMD, /* Device command region */ |
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/enic/vnic_rss.h index e325d65d7c34..5fbb3c923bcd 100644 --- a/drivers/net/enic/vnic_rss.h +++ b/drivers/net/enic/vnic_rss.h | |||
@@ -1,6 +1,19 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2008 Cisco Systems, Inc. All rights reserved. | 2 | * Copyright 2008 Cisco Systems, Inc. All rights reserved. |
3 | * Copyright 2007 Nuova Systems, Inc. All rights reserved. | 3 | * Copyright 2007 Nuova Systems, Inc. All rights reserved. |
4 | * | ||
5 | * This program is free software; you may redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation; version 2 of the License. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
10 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
11 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
12 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
13 | * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
15 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
16 | * SOFTWARE. | ||
4 | */ | 17 | */ |
5 | 18 | ||
6 | #ifndef _VNIC_RSS_H_ | 19 | #ifndef _VNIC_RSS_H_ |