summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-02-25 05:56:16 +0000
committerXin LI <delphij@FreeBSD.org>2015-02-25 05:56:16 +0000
commit0099f6f89a1325dc504096aecbdcbddad498310e (patch)
treefb8622e587884d6798b247e77bf0a8dcc352eedd /sys
parent11ad446ce58488a8870294bee24ea87050e96dbe (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/netinet/igmp.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 412b1f91b29d..96c8d62f596f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="10.0"
-BRANCH="RELEASE-p17"
+BRANCH="RELEASE-p18"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 9f31a191c750..908f304aeac8 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1533,8 +1533,8 @@ igmp_input(struct mbuf *m, int off)
case IGMP_VERSION_3: {
struct igmpv3 *igmpv3;
uint16_t igmpv3len;
- uint16_t srclen;
- int nsrc;
+ uint16_t nsrc;
+ int srclen;
IGMPSTAT_INC(igps_rcv_v3_queries);
igmpv3 = (struct igmpv3 *)igmp;