In September 1937, he became commanding officer of Patrol Wing 2, remaining in that position until 3 June 1938.

She was assigned to Patrol Wing 5 at Hamilton, Bermuda, and remained there until early 1941 when she returned to Newport, Rhode Island.

A Patrol Wing (PatWing) is a United States Navy aviation unit.

Redesignated Patrol Wing 2 30 Jun 1973.

Redesignated Patrol Wing Eleven on 30 June 1973.

Arriving Norfolk, Virginia, 9 June, she then became tender to Patrol Wing 5, Aircraft Scouting Force.

At the completion of shakedown training, she was assigned as tender to Patrol Wing 2 (PatWing 2), based in Hawaii.

By 1940 he had advanced to the rank of Rear Admiral in command of Patrol Wing 2 based in Honolulu.

She tended her flying boats of Patrol Wing 10 from Manila for 4 more days, then began a lengthy base-to-base withdrawal.

For the next five years, Swan operated as a tender for Patrol Wing (PatWing) 2 out of Pearl Harbor.