Date: Mon, 8 Apr 2013 15:13:15 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r249255 - in projects/counters: share/man/man4 sys/dev/drm2 Message-ID: <201304081513.r38FDFeH014737@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon Apr 8 15:13:15 2013 New Revision: 249255 URL: http://svnweb.freebsd.org/changeset/base/249255 Log: Merge head r243428 through r249254. Modified: projects/counters/share/man/man4/mld.4 projects/counters/sys/dev/drm2/drm_dp_iic_helper.c Directory Properties: projects/counters/ (props changed) projects/counters/share/man/man4/ (props changed) projects/counters/sys/ (props changed) Modified: projects/counters/share/man/man4/mld.4 ============================================================================== --- projects/counters/share/man/man4/mld.4 Mon Apr 8 12:09:53 2013 (r249254) +++ projects/counters/share/man/man4/mld.4 Mon Apr 8 15:13:15 2013 (r249255) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 27, 2009 +.Dd April 8, 2013 .Dt MLD 4 .Os .Sh NAME @@ -68,11 +68,6 @@ to the protocol. .Sh SYSCTL VARIABLES .Bl -tag -width indent .\" -.It net.inet6.mld.stats -This opaque read-only variable exposes the stack-wide MLDv2 -protocol statistics to -.Xr netstat 1 . -.\" .It net.inet6.mld.ifinfo This opaque read-only variable exposes the per-link MLDv2 status to .Xr ifmcstat 8 . @@ -94,11 +89,12 @@ This sysctl is normally enabled by defau .\" .El .Sh SEE ALSO -.Xr ifmcstat 8 , +.Xr netstat 1 , +.Xr sourcefilter 3 , +.Xr icmp6 4 , .Xr inet 4 , .Xr multicast 4 , -.Xr netstat 1 , -.Xr sourcefilter 3 +.Xr ifmcstat 8 .Sh HISTORY The .Nm Modified: projects/counters/sys/dev/drm2/drm_dp_iic_helper.c ============================================================================== --- projects/counters/sys/dev/drm2/drm_dp_iic_helper.c Mon Apr 8 12:09:53 2013 (r249254) +++ projects/counters/sys/dev/drm2/drm_dp_iic_helper.c Mon Apr 8 15:13:15 2013 (r249255) @@ -146,7 +146,7 @@ iic_dp_aux_xfer(device_t idev, struct ii len = msgs[m].len; buf = msgs[m].buf; reading = (msgs[m].flags & IIC_M_RD) != 0; - ret = iic_dp_aux_address(idev, msgs[m].slave, reading); + ret = iic_dp_aux_address(idev, msgs[m].slave >> 1, reading); if (ret != 0) break; if (reading) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304081513.r38FDFeH014737>