[PATCH 4.9 161/310] i40evf: fix merge error in older patch