Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

enic: whitespace cleanup; #define cleanup; more verbose err msg 



Some misc changes to cleanup whitespace issues and fix/remove some #define
HW defintions.

1) fix some whitespace issues
2) more verbose err msg when resources aren't available to configure vnic
3) remove unused #define
4) fix RSS #define rss hash types

Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c844599

drivers/net/enic/enic_main.c

+3 −2
Original line number Diff line number Diff line
@@ -1824,7 +1824,8 @@ int enic_dev_init(struct enic *enic) 
	err = enic_set_intr_mode(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Failed to set intr mode, aborting.\n");

			"Failed to set intr mode based on resource "

			"counts and system capabilities, aborting.\n");

		return err;

	}

drivers/net/enic/vnic_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct vnic_res { 
};



#define VNIC_DEV_CAP_INIT	0x0001

#define VNIC_DEV_CAP_PERBI	0x0002



struct vnic_dev {

	void *priv;

drivers/net/enic/vnic_nic.h

+6 −6
Original line number Diff line number Diff line
@@ -41,12 +41,12 @@ 
#define NIC_CFG_IG_VLAN_STRIP_EN_MASK_FIELD	1UL

#define NIC_CFG_IG_VLAN_STRIP_EN_SHIFT		24



#define NIC_CFG_RSS_HASH_TYPE_IPV4		(1 << 0)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV4		(1 << 1)

#define NIC_CFG_RSS_HASH_TYPE_IPV6		(1 << 2)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6		(1 << 3)

#define NIC_CFG_RSS_HASH_TYPE_IPV6_EX		(1 << 4)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX	(1 << 5)

#define NIC_CFG_RSS_HASH_TYPE_IPV4		(1 << 1)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV4		(1 << 2)

#define NIC_CFG_RSS_HASH_TYPE_IPV6		(1 << 3)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6		(1 << 4)

#define NIC_CFG_RSS_HASH_TYPE_IPV6_EX		(1 << 5)

#define NIC_CFG_RSS_HASH_TYPE_TCP_IPV6_EX	(1 << 6)



static inline void vnic_set_nic_cfg(u32 *nic_cfg,

	u8 rss_default_cpu, u8 rss_hash_type,