e1000: fix/complete merge of previous two commits

When fixing the conflicts caused by gallatin's commit and the reviewed
patch, I missed this location because it didn't exist when gallatin did
their change.

Obtained from: Juniper Networks, Inc.