Skip to content

Commit

Permalink
enic: whitespace cleanup; #define cleanup; more verbose err msg
Browse files Browse the repository at this point in the history 
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: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Scott Feldman <scofeldm@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Scott Feldman authored and David S. Miller committed Dec 24, 2009
1 parent 7c84459 commit d87fd25
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
5 changes: 3 additions & 2 deletions drivers/net/enic/enic_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ static inline void enic_queue_wq_skb(struct enic *enic,

/* netif_tx_lock held, process context with BHs disabled, or BH */
static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb,
struct net_device *netdev)
struct net_device *netdev)
{
struct enic *enic = netdev_priv(netdev);
struct vnic_wq *wq = &enic->wq[0];
Expand Down Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion drivers/net/enic/vnic_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ struct vnic_res {
};

#define VNIC_DEV_CAP_INIT 0x0001
#define VNIC_DEV_CAP_PERBI 0x0002

struct vnic_dev {
void *priv;
Expand Down
12 changes: 6 additions & 6 deletions drivers/net/enic/vnic_nic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d87fd25

Please sign in to comment.