git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-20190420' of git://git.kernel.dk/linux-block
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
broadcom
/
bnx2x
/
bnx2x_vfpf.c
diff --git
a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index a9bdc21873d32f31620ac169f8aff5b76cd02f7f..10ff37d6dc783b796c690a4d73bc90caa4cad931 100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@
-957,7
+957,7
@@
int bnx2x_vfpf_update_vlan(struct bnx2x *bp, u16 vid, u8 vf_qid, bool add)
bnx2x_sample_bulletin(bp);
if (bp->shadow_bulletin.content.valid_bitmap & 1 << VLAN_VALID) {
- BNX2X_ERR("Hypervisor will d
i
cline the request, avoiding\n");
+ BNX2X_ERR("Hypervisor will d
e
cline the request, avoiding\n");
rc = -EINVAL;
goto out;
}