projects
/
linux-2.6-microblaze.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
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx5
/
core
/
eswitch.c
diff --git
a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index
b79d748
..
dd01ad4
100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@
-2216,6
+2216,6
@@
free_out:
u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw)
{
- return
esw->mode
;
+ return
ESW_ALLOWED(esw) ? esw->mode : SRIOV_NONE
;
}
EXPORT_SYMBOL_GPL(mlx5_eswitch_mode);