My new setup for the past month is very simple. My TL-WR845N router is connected to ONU via its WAN port. ONU connected to the OLT over Fiber. The WAN connection is over PPPoE. In the TL-WR845N, the u