Merge branch 'pppoe-discovery-cleanup' of https://github.com/TDT-AG/ppp