Abstract: With the increase of internet users and the diversification of network applications , it is necessary for router itself to improve the congestion control mechanism. In this paper, the router congestion control issue based on per-flow scheduling is investigated. By adopting the fair queuing instead of traditional FCFS service discipline, the router is able to isolate and protect leaky-bucket controlled network connections. However, to achieve fair bandwidth allocation for feedback controlled and adaptive connection such as TCP, the router needs to combine fair queuing with appropriate buffer management schemes. A new buffer management scheme of the fair buffer drop is proposed. Simulation results show that the proposed schemes can obtain better performance comparing with that of the RED buffer management.