aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid C Somayajulu <davidcs@FreeBSD.org>2016-05-10 03:11:37 +0000
committerDavid C Somayajulu <davidcs@FreeBSD.org>2016-05-10 03:11:37 +0000
commitf08798cea7c5bca59ff7e926df53bf64dec0207d (patch)
tree2f844490e2d1d12c8ff41c3a20b00c2e91de1f91
parent3861aa4a836c012f23d0d4b606c5e83d3d4ef869 (diff)
downloadsrc-f08798cea7c5bca59ff7e926df53bf64dec0207d.tar.gz
src-f08798cea7c5bca59ff7e926df53bf64dec0207d.zip
MFC r298591
1. Removed -Wno-shift-negative-value from Makefile 2. Fixed warning its absence caused in bxe_elink.c
Notes
Notes: svn path=/stable/8/; revision=299305
-rw-r--r--sys/dev/bxe/bxe_elink.c4
-rw-r--r--sys/modules/bxe/Makefile1
2 files changed, 2 insertions, 3 deletions
diff --git a/sys/dev/bxe/bxe_elink.c b/sys/dev/bxe/bxe_elink.c
index ad2718675d36..0ce0433598a0 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 310264173ed9..021b15d8e185 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>