From faf0b9b85b486d7ca9970e44d27ad5cf37609097 Mon Sep 17 00:00:00 2001 From: Or Gerlitz Date: Sat, 26 Nov 2011 19:55:06 +0000 Subject: [PATCH] --- yaml --- r: 277975 b: refs/heads/master c: 0d9fdaa9f53cf65a2470e8a7506b59fd88d409e2 h: refs/heads/master i: 277973: 4f4573e0c20e72ce94cba11b2998c1df4d5a3531 277971: 86eaf3a60d05a0671b123c8bb58c64e2da7a771c 277967: 50423b1aaa21cee9980ec3b39eb3c0ceae4f6c79 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c20506f28dd5..87a68f7e78cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1202d460b1df3a77fda66f4ba5f90ae3527dd42f +refs/heads/master: 0d9fdaa9f53cf65a2470e8a7506b59fd88d409e2 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index ef7dfcff588d..d2dd97fa091f 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -485,9 +485,9 @@ struct mlx4_en_priv { enum mlx4_en_wol { MLX4_EN_WOL_MAGIC = (1ULL << 61), MLX4_EN_WOL_ENABLED = (1ULL << 62), - MLX4_EN_WOL_DO_MODIFY = (1ULL << 63), }; +#define MLX4_EN_WOL_DO_MODIFY (1ULL << 63) void mlx4_en_destroy_netdev(struct net_device *dev); int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,