projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
[linux-2.6-block.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_main.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_main.c
b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index bb904ec511bea26c567685edab19a37fb1c1e3c9..ac0583ff280d1b5fd3efecec56a9ce9c92a43a11 100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_main.c
@@
-2004,6
+2004,7
@@
static int ipoib_get_vf_config(struct net_device *dev, int vf,
return err;
ivf->vf = vf;
+ memcpy(ivf->mac, dev->dev_addr, dev->addr_len);
return 0;
}