From: Shrikrishna Khare <skhare@vmware.com>
Date: Fri, 13 Nov 2015 23:42:10 +0000 (-0800)
Subject: Driver: Vmxnet3: Fix use of mfTableLen for big endian architectures
X-Git-Tag: v4.1.12-93~2^2~67
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb84d448a87b45488685d48180b5aae46c4c44ba;p=users%2Fjedix%2Flinux-maple.git

Driver: Vmxnet3: Fix use of mfTableLen for big endian architectures

Orabug: 25639933

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>
(cherry picked from commit d37d5ec861b0d937c0bdd70f0138e2750aacccdb)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

Conflicts:
	drivers/net/vmxnet3/vmxnet3_int.h
---

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 05c809640a62..d04e6c35229d 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -2161,12 +2161,13 @@ vmxnet3_set_mc(struct net_device *netdev)
 		if (!netdev_mc_empty(netdev)) {
 			new_table = vmxnet3_copy_mc(netdev);
 			if (new_table) {
-				rxConf->mfTableLen = cpu_to_le16(
-					netdev_mc_count(netdev) * ETH_ALEN);
+				size_t sz = netdev_mc_count(netdev) * ETH_ALEN;
+
+				rxConf->mfTableLen = cpu_to_le16(sz);
 				new_table_pa = dma_map_single(
 							&adapter->pdev->dev,
 							new_table,
-							rxConf->mfTableLen,
+							sz,
 							PCI_DMA_TODEVICE);
 			}