svn commit: r276348 - in projects/clang350-import: contrib/binutils/gas/config share/man/man4 sys/dev/ahci
Dimitry Andric
dim at FreeBSD.org
Sun Dec 28 21:13:58 UTC 2014
Author: dim
Date: Sun Dec 28 21:13:55 2014
New Revision: 276348
URL: https://svnweb.freebsd.org/changeset/base/276348
Log:
Merge ^/head r274961 through r276346.
Modified:
projects/clang350-import/contrib/binutils/gas/config/tc-ppc.c
projects/clang350-import/share/man/man4/tcp.4
projects/clang350-import/sys/dev/ahci/ahci.c
projects/clang350-import/sys/dev/ahci/ahci_pci.c
projects/clang350-import/sys/dev/ahci/ahciem.c
Directory Properties:
projects/clang350-import/ (props changed)
projects/clang350-import/contrib/binutils/ (props changed)
projects/clang350-import/share/ (props changed)
projects/clang350-import/share/man/man4/ (props changed)
projects/clang350-import/sys/ (props changed)
Modified: projects/clang350-import/contrib/binutils/gas/config/tc-ppc.c
==============================================================================
--- projects/clang350-import/contrib/binutils/gas/config/tc-ppc.c Sun Dec 28 21:13:52 2014 (r276347)
+++ projects/clang350-import/contrib/binutils/gas/config/tc-ppc.c Sun Dec 28 21:13:55 2014 (r276348)
@@ -1548,7 +1548,7 @@ ppc_insert_operand (unsigned long insn,
errmsg = NULL;
insn = (*operand->insert) (insn, (long) val, ppc_cpu, &errmsg);
if (errmsg != (const char *) NULL)
- as_bad_where (file, line, errmsg);
+ as_bad_where (file, line, "%s", errmsg);
}
else
insn |= ((long) val & operand->bitm) << operand->shift;
@@ -2279,7 +2279,7 @@ md_assemble (char *str)
{
insn = (*operand->insert) (insn, 0L, ppc_cpu, &errmsg);
if (errmsg != (const char *) NULL)
- as_bad (errmsg);
+ as_bad ("%s", errmsg);
continue;
}
@@ -2292,7 +2292,7 @@ md_assemble (char *str)
{
insn = (*operand->insert) (insn, 0L, ppc_cpu, &errmsg);
if (errmsg != (const char *) NULL)
- as_bad (errmsg);
+ as_bad ("%s", errmsg);
}
if ((operand->flags & PPC_OPERAND_NEXT) != 0)
next_opindex = *opindex_ptr + 1;
Modified: projects/clang350-import/share/man/man4/tcp.4
==============================================================================
--- projects/clang350-import/share/man/man4/tcp.4 Sun Dec 28 21:13:52 2014 (r276347)
+++ projects/clang350-import/share/man/man4/tcp.4 Sun Dec 28 21:13:55 2014 (r276348)
@@ -521,11 +521,11 @@ This is needed to help with connection e
when a broken firewall is in the network path.
.It Va pmtud_blackhole_detection
Turn on automatic path MTU blackhole detection.
-In case of retransmits we will
+In case of retransmits OS will
lower the MSS to check if it's MTU problem.
If current MSS is greater than
-configured value to try, it will be set to it, otherwise, MSS will be set to
-default values
+configured value to try, it will be set to configured value, otherwise,
+MSS will be set to default values
.Po Va net.inet.tcp.mssdflt
and
.Va net.inet.tcp.v6mssdflt
@@ -535,11 +535,12 @@ MSS to try for IPv4 if PMTU blackhole de
.It Va v6pmtud_blackhole_mss
MSS to try for IPv6 if PMTU blackhole detection is turned on.
.It Va pmtud_blackhole_activated
-Number of times the code was activated to attempt a MSS downshift.
-.It Va pmtud_blackhole_min_activated
-Number of times the blackhole MSS was used in an attempt to downshift.
+Number of times configured values were used in an attempt to downshift.
+.It Va pmtud_blackhole_activated_min_mss
+Number of times default MSS was used in an attempt to downshift.
.It Va pmtud_blackhole_failed
-Number of times that we failed to connect after we downshifted the MSS.
+Number of connections for which retransmits continued even after MSS
+downshift.
.El
.Sh ERRORS
A socket operation may fail with one of the following errors returned:
Modified: projects/clang350-import/sys/dev/ahci/ahci.c
==============================================================================
--- projects/clang350-import/sys/dev/ahci/ahci.c Sun Dec 28 21:13:52 2014 (r276347)
+++ projects/clang350-import/sys/dev/ahci/ahci.c Sun Dec 28 21:13:55 2014 (r276348)
@@ -868,14 +868,14 @@ static device_method_t ahcich_methods[]
DEVMETHOD(device_detach, ahci_ch_detach),
DEVMETHOD(device_suspend, ahci_ch_suspend),
DEVMETHOD(device_resume, ahci_ch_resume),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ahcich_driver = {
"ahcich",
ahcich_methods,
sizeof(struct ahci_channel)
};
-DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, 0, 0);
+DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, NULL, NULL);
struct ahci_dc_cb_args {
bus_addr_t maddr;
Modified: projects/clang350-import/sys/dev/ahci/ahci_pci.c
==============================================================================
--- projects/clang350-import/sys/dev/ahci/ahci_pci.c Sun Dec 28 21:13:52 2014 (r276347)
+++ projects/clang350-import/sys/dev/ahci/ahci_pci.c Sun Dec 28 21:13:55 2014 (r276348)
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
static int force_ahci = 1;
TUNABLE_INT("hw.ahci.force", &force_ahci);
-static struct {
+static const struct {
uint32_t id;
uint8_t rev;
const char *name;
@@ -479,14 +479,14 @@ static device_method_t ahci_methods[] =
DEVMETHOD(bus_teardown_intr,ahci_teardown_intr),
DEVMETHOD(bus_child_location_str, ahci_child_location_str),
DEVMETHOD(bus_get_dma_tag, ahci_get_dma_tag),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ahci_driver = {
"ahci",
ahci_methods,
sizeof(struct ahci_controller)
};
-DRIVER_MODULE(ahci, pci, ahci_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(ahci, pci, ahci_driver, ahci_devclass, NULL, NULL);
static device_method_t ahci_ata_methods[] = {
DEVMETHOD(device_probe, ahci_ata_probe),
DEVMETHOD(device_attach, ahci_pci_attach),
@@ -499,11 +499,11 @@ static device_method_t ahci_ata_methods[
DEVMETHOD(bus_setup_intr, ahci_setup_intr),
DEVMETHOD(bus_teardown_intr,ahci_teardown_intr),
DEVMETHOD(bus_child_location_str, ahci_child_location_str),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ahci_ata_driver = {
"ahci",
ahci_ata_methods,
sizeof(struct ahci_controller)
};
-DRIVER_MODULE(ahci, atapci, ahci_ata_driver, ahci_devclass, 0, 0);
+DRIVER_MODULE(ahci, atapci, ahci_ata_driver, ahci_devclass, NULL, NULL);
Modified: projects/clang350-import/sys/dev/ahci/ahciem.c
==============================================================================
--- projects/clang350-import/sys/dev/ahci/ahciem.c Sun Dec 28 21:13:52 2014 (r276347)
+++ projects/clang350-import/sys/dev/ahci/ahciem.c Sun Dec 28 21:13:55 2014 (r276348)
@@ -273,14 +273,14 @@ static device_method_t ahciem_methods[]
DEVMETHOD(device_detach, ahci_em_detach),
DEVMETHOD(device_suspend, ahci_em_suspend),
DEVMETHOD(device_resume, ahci_em_resume),
- { 0, 0 }
+ DEVMETHOD_END
};
static driver_t ahciem_driver = {
"ahciem",
ahciem_methods,
sizeof(struct ahci_enclosure)
};
-DRIVER_MODULE(ahciem, ahci, ahciem_driver, ahciem_devclass, 0, 0);
+DRIVER_MODULE(ahciem, ahci, ahciem_driver, ahciem_devclass, NULL, NULL);
static void
ahci_em_setleds(device_t dev, int c)
More information about the svn-src-projects
mailing list