Diageo has again extended its sponsorship of the McLaren-Honda Formula One team for its Johnnie Walker Scotch whisky brand.