From 77ebcd2b1075347592190fa6630666dda0537329 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 21 Oct 2010 18:05:34 +0000 Subject: [PATCH] --- yaml --- r: 218398 b: refs/heads/master c: 0561cf3dbff1f37c0d374fb1b824ef3a117c85e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6f1e835bdeff..70402f96e227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81e8e5601fba4ea5bc3bfbed0fec074cf65feca5 +refs/heads/master: 0561cf3dbff1f37c0d374fb1b824ef3a117c85e0 diff --git a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c index 2ea4b818a07c..e3658e10db39 100644 --- a/trunk/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/trunk/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2665,7 +2665,7 @@ vmxnet3_resume(struct device *device) adapter->shared->devRead.pmConfDesc.confVer = cpu_to_le32(1); adapter->shared->devRead.pmConfDesc.confLen = cpu_to_le32(sizeof( *pmConf)); - adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le32(virt_to_phys( + adapter->shared->devRead.pmConfDesc.confPA = cpu_to_le64(virt_to_phys( pmConf)); netif_device_attach(netdev);