Fix to check both up and downstream port types.

Fix to check both up and downstream port types. #2041