]> bbs.cooldavid.org Git - net-next-2.6.git/commit
ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG
authorJohn Fastabend <john.r.fastabend@intel.com>
Sun, 8 Aug 2010 15:46:15 +0000 (15:46 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Aug 2010 03:02:44 +0000 (20:02 -0700)
commit4bc091d85f979a1a18ef2d710b819b3c5b397707
tree01a5155e8966d53514648b211aaea13843c655b9
parent16d884bd901288fb5cde876489f7093740b66a30
ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG

Building ixgbe without DCB_CONFIG and FCOE_CONFIG will cause
a build error.  This resolves the build error by wrapping
the fcoe.up in CONFIG_IXGBE_DCB ifdefs.

Also frames were being priority VLAN tagged even without DCB
enabled.  This fixes this so that 8021Q priority tags are
only added with DCB actually enabled.

Reported-by: divya <dipraksh@linux.vnet.ibm.com>
Reported-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ixgbe/ixgbe_main.c