svn commit: r299299 - in stable/10/sys: dev/bxe modules/bxe

[David C Somayajulu]

Author: davidcs
Date: Tue May 10 02:35:13 2016
New Revision: 299299
URL: https://svnweb.freebsd.org/changeset/base/299299

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

Modified:
  stable/10/sys/dev/bxe/bxe_elink.c
  stable/10/sys/modules/bxe/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/bxe/bxe_elink.c
==============================================================================
--- stable/10/sys/dev/bxe/bxe_elink.c	Tue May 10 02:30:18 2016	(r299298)
+++ stable/10/sys/dev/bxe/bxe_elink.c	Tue May 10 02:35:13 2016	(r299299)
@@ -11969,8 +11969,8 @@ static elink_status_t elink_54618se_conf
 			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 */

Modified: stable/10/sys/modules/bxe/Makefile
==============================================================================
--- stable/10/sys/modules/bxe/Makefile	Tue May 10 02:30:18 2016	(r299298)
+++ stable/10/sys/modules/bxe/Makefile	Tue May 10 02:35:13 2016	(r299299)
@@ -14,6 +14,5 @@ SRCS	+= bxe.c               \
            57712_init_values.c
 
 CFLAGS += -I${BXE}
-#CFLAGS += -Wno-shift-negative-value
 
 .include <bsd.kmod.mk>