diff options
| author | Vasanthy Kolluri <vkolluri@cisco.com> | 2010-11-15 08:09:55 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-15 11:13:19 -0800 |
| commit | 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c (patch) | |
| tree | 7830cff52e76bb8c650425bdc3203e1e5299b939 /drivers/net/enic | |
| parent | ce5a121304af02d02489e86efb6ae26a67f95e52 (diff) | |
| download | kernel_samsung_smdk4412-1f4f067f99cbb2af7af7a67bd025a9fb58b5156c.zip kernel_samsung_smdk4412-1f4f067f99cbb2af7af7a67bd025a9fb58b5156c.tar.gz kernel_samsung_smdk4412-1f4f067f99cbb2af7af7a67bd025a9fb58b5156c.tar.bz2 | |
enic: Fix build warnings
Fix data type of argument passed to pci_alloc_consistent and pci_free_consistent routines.
Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic')
| -rw-r--r-- | drivers/net/enic/enic.h | 2 | ||||
| -rw-r--r-- | drivers/net/enic/enic_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index c91d364..70672541 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -32,7 +32,7 @@ #define DRV_NAME "enic" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" -#define DRV_VERSION "1.4.1.6" +#define DRV_VERSION "1.4.1.7" #define DRV_COPYRIGHT "Copyright 2008-2010 Cisco Systems, Inc" #define ENIC_BARS_MAX 6 diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index a466ef9..9f293fa 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -2042,7 +2042,7 @@ static int enic_dev_hang_reset(struct enic *enic) static int enic_set_rsskey(struct enic *enic) { - u64 rss_key_buf_pa; + dma_addr_t rss_key_buf_pa; union vnic_rss_key *rss_key_buf_va = NULL; union vnic_rss_key rss_key = { .key[0].b = {85, 67, 83, 97, 119, 101, 115, 111, 109, 101}, @@ -2073,7 +2073,7 @@ static int enic_set_rsskey(struct enic *enic) static int enic_set_rsscpu(struct enic *enic, u8 rss_hash_bits) { - u64 rss_cpu_buf_pa; + dma_addr_t rss_cpu_buf_pa; union vnic_rss_cpu *rss_cpu_buf_va = NULL; unsigned int i; int err; |