Commit 21fc578d authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

enic: misc cleanup items: 



Clarrify reading PBA has no side-effect (clearing).
Add missing GPL license text.

Signed-off-by: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84596451

drivers/net/enic/vnic_intr.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

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);

	return ioread32(legacy_pba);

}

}

drivers/net/enic/vnic_resource.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ enum vnic_res_type { 
	RES_TYPE_INTR_CTRL,		/* Interrupt ctrl table */

	RES_TYPE_INTR_CTRL,		/* Interrupt ctrl table */

	RES_TYPE_INTR_TABLE,		/* MSI/MSI-X Interrupt table */

	RES_TYPE_INTR_TABLE,		/* MSI/MSI-X Interrupt table */

	RES_TYPE_INTR_PBA,		/* MSI/MSI-X PBA 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_RSVD6,

	RES_TYPE_RSVD7,

	RES_TYPE_RSVD7,

	RES_TYPE_DEVCMD,		/* Device command region */

	RES_TYPE_DEVCMD,		/* Device command region */

drivers/net/enic/vnic_rss.h

+13 −0
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright 2008 Cisco Systems, Inc.  All rights reserved.

 * Copyright 2008 Cisco Systems, Inc.  All rights reserved.

 * Copyright 2007 Nuova 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_

#ifndef _VNIC_RSS_H_