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 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx4
/
en_ethtool.c
diff --git
a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index bcf4d118e98c9228b32ac196136b15fa515c7ace..c9e6b62dd000955565fb0186d334221a834b0a40 100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@
-889,7
+889,7
@@
static int mlx4_en_flow_replace(struct net_device *dev,
.queue_mode = MLX4_NET_TRANS_Q_FIFO,
.exclusive = 0,
.allow_loopback = 1,
- .promisc_mode = MLX4_FS_
PROMISC_NONE
,
+ .promisc_mode = MLX4_FS_
REGULAR
,
};
rule.port = priv->port;