git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnx2x
/
bnx2x_sriov.c
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index
8d0479d
..
02a23c2
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@
-2696,7
+2696,7
@@
out:
bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC);
}
- return
0
;
+ return
rc
;
}
int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)