From 979dd2ae7c2a07c4a0bb4508ed54927e26f1a435 Mon Sep 17 00:00:00 2001 From: Scott Feldman Date: Fri, 21 Nov 2008 21:29:25 -0800 Subject: [PATCH] --- yaml --- r: 122079 b: refs/heads/master c: 21fc578dcaa66dd30bad3c2f2cd7578e2865e8f2 h: refs/heads/master i: 122077: 40d6b318123747d9e78b53315aae2c8ed74b0d9a 122075: 84e9a9908100b27eaafee687a6601fd1dfcf2e70 122071: ad95f622afe36a5e52f40aaf02dc01482255f271 122063: 40779b55228b4be807704e0fa687314244f34628 122047: ad15cc65405231694a45932998f82759ebbc9787 v: v3 --- [refs] | 2 +- trunk/drivers/net/enic/vnic_intr.h | 2 +- trunk/drivers/net/enic/vnic_resource.h | 2 +- trunk/drivers/net/enic/vnic_rss.h | 13 +++++++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 166108bb2b92..08b4d25692e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 845964515a76381e204d3399af82c149f8abcc1c +refs/heads/master: 21fc578dcaa66dd30bad3c2f2cd7578e2865e8f2 diff --git a/trunk/drivers/net/enic/vnic_intr.h b/trunk/drivers/net/enic/vnic_intr.h index ccc408116af8..ce633a5a7e3c 100644 --- a/trunk/drivers/net/enic/vnic_intr.h +++ b/trunk/drivers/net/enic/vnic_intr.h @@ -78,7 +78,7 @@ static inline void vnic_intr_return_credits(struct vnic_intr *intr, static inline u32 vnic_intr_legacy_pba(u32 __iomem *legacy_pba) { - /* get and ack interrupt in one read (clear-and-ack-on-read) */ + /* read PBA without clearing */ return ioread32(legacy_pba); } diff --git a/trunk/drivers/net/enic/vnic_resource.h b/trunk/drivers/net/enic/vnic_resource.h index 144d2812f081..b61c22aec41a 100644 --- a/trunk/drivers/net/enic/vnic_resource.h +++ b/trunk/drivers/net/enic/vnic_resource.h @@ -38,7 +38,7 @@ enum vnic_res_type { RES_TYPE_INTR_CTRL, /* Interrupt ctrl table */ RES_TYPE_INTR_TABLE, /* MSI/MSI-X Interrupt table */ RES_TYPE_INTR_PBA, /* MSI/MSI-X PBA table */ - RES_TYPE_INTR_PBA_LEGACY, /* Legacy intr status, r2c */ + RES_TYPE_INTR_PBA_LEGACY, /* Legacy intr status */ RES_TYPE_RSVD6, RES_TYPE_RSVD7, RES_TYPE_DEVCMD, /* Device command region */ diff --git a/trunk/drivers/net/enic/vnic_rss.h b/trunk/drivers/net/enic/vnic_rss.h index e325d65d7c34..5fbb3c923bcd 100644 --- a/trunk/drivers/net/enic/vnic_rss.h +++ b/trunk/drivers/net/enic/vnic_rss.h @@ -1,6 +1,19 @@ /* * Copyright 2008 Cisco Systems, Inc. All rights reserved. * Copyright 2007 Nuova Systems, Inc. All rights reserved. + * + * This program is free software; you may redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #ifndef _VNIC_RSS_H_