Skip to content
Commit 3f518390 authored by Arthur Jones's avatar Arthur Jones Committed by David S. Miller
Browse files

e1000e: fixup merge error

When merging into Jeff's tree:

	commit 5f66f208


	Author: Arthur Jones <ajones@riverbed.com>
	Date:   Thu Mar 19 01:13:08 2009 +0000

	    e1000e: allow tx of pre-formatted vlan tagged packets

We lost one line, this fixes that missing
piece...

Signed-off-by: default avatarArthur Jones <ajones@riverbed.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b1c4354
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment