From c2565482487b243a6c36f2f033a06ecdc9a794ad Mon Sep 17 00:00:00 2001
From: davidcs <davidcs@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 10 May 2016 03:11:37 +0000
Subject: [PATCH] MFC r298591

1. Removed -Wno-shift-negative-value from Makefile
2. Fixed warning its absence caused in bxe_elink.c


git-svn-id: svn://svn.freebsd.org/base/stable/8@299305 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/bxe/bxe_elink.c  | 4 ++--
 sys/modules/bxe/Makefile | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/dev/bxe/bxe_elink.c b/sys/dev/bxe/bxe_elink.c
index ad2718675..0ce043359 100644
--- a/sys/dev/bxe/bxe_elink.c
+++ b/sys/dev/bxe/bxe_elink.c
@@ -11969,8 +11969,8 @@ static elink_status_t elink_54618se_config_init(struct elink_phy *phy,
 			elink_eee_disable(phy, params, vars);
 		}
 	} else {
-		vars->eee_status &= ~SHMEM_EEE_1G_ADV <<
-				    SHMEM_EEE_SUPPORTED_SHIFT;
+		vars->eee_status &= ((uint32_t)(~SHMEM_EEE_1G_ADV) <<
+				    SHMEM_EEE_SUPPORTED_SHIFT);
 
 		if (phy->flags & ELINK_FLAGS_EEE) {
 			/* Handle legacy auto-grEEEn */
diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile
index 310264173..021b15d8e 100644
--- a/sys/modules/bxe/Makefile
+++ b/sys/modules/bxe/Makefile
@@ -14,6 +14,5 @@ SRCS	+= bxe.c               \
            57712_init_values.c
 
 CFLAGS += -I${BXE}
-#CFLAGS += -Wno-shift-negative-value
 
 .include <bsd.kmod.mk>
-- 
2.42.0