OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
[uclinux-h8/linux.git]
/
include
/
linux
/
mlx5
/
driver.h
diff --git
a/include/linux/mlx5/driver.h
b/include/linux/mlx5/driver.h
index
4b75796
..
94ffd02
100644
(file)
--- a/
include/linux/mlx5/driver.h
+++ b/
include/linux/mlx5/driver.h
@@
-163,10
+163,7
@@
enum mlx5_dcbx_oper_mode {
};
enum mlx5_dct_atomic_mode {
};
enum mlx5_dct_atomic_mode {
- MLX5_ATOMIC_MODE_DCT_OFF = 20,
- MLX5_ATOMIC_MODE_DCT_NONE = 0 << MLX5_ATOMIC_MODE_DCT_OFF,
- MLX5_ATOMIC_MODE_DCT_IB_COMP = 1 << MLX5_ATOMIC_MODE_DCT_OFF,
- MLX5_ATOMIC_MODE_DCT_CX = 2 << MLX5_ATOMIC_MODE_DCT_OFF,
+ MLX5_ATOMIC_MODE_DCT_CX = 2,
};
enum {
};
enum {
@@
-477,6
+474,7
@@
struct mlx5_core_srq {
atomic_t refcount;
struct completion free;
atomic_t refcount;
struct completion free;
+ u16 uid;
};
struct mlx5_eq_table {
};
struct mlx5_eq_table {