projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.5-rc5 into usb-next
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
mellanox
/
mlx4
/
mlx4_en.h
diff --git
a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index
6ae3509
..
225c20d
100644
(file)
--- a/
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@
-495,6
+495,7
@@
struct mlx4_en_priv {
int vids[128];
bool wol;
struct device *ddev;
+ int base_tx_qpn;
#ifdef CONFIG_MLX4_EN_DCB
struct ieee_ets ets;