Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx4
/
mcg.c
diff --git
a/kernel/drivers/net/ethernet/mellanox/mlx4/mcg.c
b/kernel/drivers/net/ethernet/mellanox/mlx4/mcg.c
index
bd9ea0d
..
1d4e2e0
100644
(file)
--- a/
kernel/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/
kernel/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@
-1184,10
+1184,11
@@
out:
if (prot == MLX4_PROT_ETH) {
/* manage the steering entry for promisc mode */
if (new_entry)
if (prot == MLX4_PROT_ETH) {
/* manage the steering entry for promisc mode */
if (new_entry)
- new_steering_entry(dev, port, steer, index, qp->qpn);
+ err = new_steering_entry(dev, port, steer,
+ index, qp->qpn);
else
else
- existing_steering_entry(dev, port, steer,
- index, qp->qpn);
+ e
rr = e
xisting_steering_entry(dev, port, steer,
+
index, qp->qpn);
}
if (err && link && index != -1) {
if (index < dev->caps.num_mgms)
}
if (err && link && index != -1) {
if (index < dev->caps.num_mgms)