Merge r240680 from head:

  Align the PCI Express #defines with the style used for the PCI-X
  #defines.  This has the advantage that it makes the names more
  compact, and also allows us to correct the non-uniform naming of
  the PCIM_LINK_* defines, making them all consistent amongst themselves.

  This is a mostly mechanical rename:
    s/PCIR_EXPRESS_/PCIER_/g
    s/PCIM_EXP_/PCIEM_/g
    s/PCIM_LINK_/PCIEM_LINK_/g

  In this MFC, #defines have been added for the old names to assist
  out-of-tree drivers.


git-svn-id: svn://svn.freebsd.org/base/stable/9@242015 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Merge r240680 from head:

  Align the PCI Express #defines with the style used for the PCI-X
  #defines.  This has the advantage that it makes the names more
  compact, and also allows us to correct the non-uniform naming of
  the PCIM_LINK_* defines, making them all consistent amongst themselves.

  This is a mostly mechanical rename:
    s/PCIR_EXPRESS_/PCIER_/g
    s/PCIM_EXP_/PCIEM_/g
    s/PCIM_LINK_/PCIEM_LINK_/g

  In this MFC, #defines have been added for the old names to assist
  out-of-tree drivers.


git-svn-id: svn://svn.freebsd.org/base/stable/9@242016 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC: r241582
Add a comment describing why r241097 was done.


git-svn-id: svn://svn.freebsd.org/base/stable/9@242017 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241835:
Fix conditional expression: previously a bitvector would be operated
	on by a logical not.

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242019 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241829:
Fix conditional expression: previously a bit vector was being operated
	on by a logical not instead of the entire expression.

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242022 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241838:
	Remove unused variable. Newer versions of gcc care.

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242025 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241833:
	Make xen python scripts work with python3

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242028 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241839:
	Be a bit more lenient in the maximum number of redirects allowed.
	Chrome and Firefox have a limit of 20. IE has a limit of 8.

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242032 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241834:
	Make do_uniq work with python3

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242035 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241849:
	Fix typo in error when unable to create TCP socket

PR:		bin/172490
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242039 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241832:
	Covert regression test to python 3

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242041 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241893:
	Update re members to reality

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242044 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241846:
	bcd isn't installed setuid.
	caesar isn't installed setuid.

For the archaeologists:
	it seems this call originally came from NetBSD PR 5970 and 5945

PR:		172566
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242047 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241837:
	Fix build if COMPAT_43 is defined without one of
	COMPAT_FREEBSD[4567]

Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242049 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241842:
	Add support for gjournal to dumpfs

PR:		165821
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242051 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241847:
	Free buf when its no longer used. This helps eliminate a static analysis
	warning.

PR:		ports/172566
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242053 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241825:
	Print flags as hex instead of an integer.

PR:		kern/168210
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242056 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r241827:
	Mark bsdar_errc as __dead2 to help code analysis tools.

PR:		bin/172636
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@242057 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC 241496:

	Some 3G modems return the wrong signature in echo packets and make it
	impossible to use LQR/ECHO. They return want_magic instead.

	With this change it is now possible to use

		enable lqr
		set lqrperiod 5
		enable echo
		set echoperiod 5

	in your ppp.conf file.


git-svn-id: svn://svn.freebsd.org/base/stable/9@242095 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC 241555:

 Implement modem control in u3g. Tested on Option GTM382W, Huawei E220,
 and Sierra Wireless MC8790V. Also implement the .ucom_poll method.

 Note: It resolves ppp hanging during the PPp> phase.


git-svn-id: svn://svn.freebsd.org/base/stable/9@242100 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f