MFC r291363:Clean up trailing whitespace
MFC: r285543Add a missing break statement, which made the code default to IPv6.PR: 201285Submitted by: David BindermanApproved by: re (gjb)