From: Michael Chan <mchan@broadcom.com>
Date: Thu, 14 Aug 2008 22:30:14 +0000 (-0700)
Subject: bnx2: Reinsert VLAN tag when necessary.
X-Git-Tag: v2.6.27-rc4~39^2~45
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22828e89f4f3e8c74ca7ffa69b0410afbd80eee;p=pandora-kernel.git

bnx2: Reinsert VLAN tag when necessary.

In certain cases when ASF or other management firmware is running, the
chip may be configured to always strip out the VLAN tag even when
VLAN acceleration is not enabled.  This causes some VLAN tagged
packets to be received by the host stack without any knowledge that
the original packet was VLAN tagged.

We fix this by re-inserting the VLAN tag into the packet when necessary.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed