Review 12941 refactor gre controller

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>