[bwh: Forward-ported to net-next-2.6.]
Signed-off-by: NBen Hutchings <bhutchings@solarflare.com>