bnx2x: Update bnx2x to use new vlan accleration.

Make the bnx2x driver use the new vlan accleration model.

Signed-off-by: Hao Zheng <hzheng@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
CC: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/bnx2x/bnx2x.h
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_ethtool.c
Simple merge

diff --cc drivers/net/bnx2x/bnx2x_main.c
Simple merge