diff options
author | Shrikrishna Khare <skhare@vmware.com> | 2015-11-13 18:42:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-11-16 15:06:47 -0500 |
commit | d37d5ec861b0d937c0bdd70f0138e2750aacccdb (patch) | |
tree | 53f80fc5381b3f0e9c7058370ea7cae43ca5eeb6 /drivers/net/vmxnet3 | |
parent | 0b88393cdf6b1322522849e61f7a3328f4fd3843 (diff) |
Driver: Vmxnet3: Fix use of mfTableLen for big endian architectures
Signed-off-by: Shrikrishna Khare <skhare@vmware.com>
Reported-by: Masao Uebayashi <uebayasi@gmail.com>
Signed-off-by: Bhavesh Davda <bhavesh@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 7 | ||||
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_int.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 46f4caddccbe..899ea4288197 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -2157,12 +2157,13 @@ vmxnet3_set_mc(struct net_device *netdev) | |||
2157 | if (!netdev_mc_empty(netdev)) { | 2157 | if (!netdev_mc_empty(netdev)) { |
2158 | new_table = vmxnet3_copy_mc(netdev); | 2158 | new_table = vmxnet3_copy_mc(netdev); |
2159 | if (new_table) { | 2159 | if (new_table) { |
2160 | rxConf->mfTableLen = cpu_to_le16( | 2160 | size_t sz = netdev_mc_count(netdev) * ETH_ALEN; |
2161 | netdev_mc_count(netdev) * ETH_ALEN); | 2161 | |
2162 | rxConf->mfTableLen = cpu_to_le16(sz); | ||
2162 | new_table_pa = dma_map_single( | 2163 | new_table_pa = dma_map_single( |
2163 | &adapter->pdev->dev, | 2164 | &adapter->pdev->dev, |
2164 | new_table, | 2165 | new_table, |
2165 | rxConf->mfTableLen, | 2166 | sz, |
2166 | PCI_DMA_TODEVICE); | 2167 | PCI_DMA_TODEVICE); |
2167 | } | 2168 | } |
2168 | 2169 | ||
diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index 3f859a55c035..4c58c83dc225 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h | |||
@@ -69,10 +69,10 @@ | |||
69 | /* | 69 | /* |
70 | * Version numbers | 70 | * Version numbers |
71 | */ | 71 | */ |
72 | #define VMXNET3_DRIVER_VERSION_STRING "1.4.3.0-k" | 72 | #define VMXNET3_DRIVER_VERSION_STRING "1.4.4.0-k" |
73 | 73 | ||
74 | /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ | 74 | /* a 32-bit int, each byte encode a verion number in VMXNET3_DRIVER_VERSION */ |
75 | #define VMXNET3_DRIVER_VERSION_NUM 0x01040300 | 75 | #define VMXNET3_DRIVER_VERSION_NUM 0x01040400 |
76 | 76 | ||
77 | #if defined(CONFIG_PCI_MSI) | 77 | #if defined(CONFIG_PCI_MSI) |
78 | /* RSS only makes sense if MSI-X is supported. */ | 78 | /* RSS only makes sense if MSI-X is supported. */ |