John Fastabend 4bc091d85f 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>		2010-08-08 20:02:44 -07:00
..
accessibility
acpi	acpi ec_sys: Be more cautious about ec write access	2010-08-03 09:49:13 -04:00
amba
ata
atm	solos-pci: Fix race condition in tasklet RX handling	2010-08-07 23:02:59 -07:00
auxdisplay
base	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
block	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
bluetooth
cdrom
char	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
clocksource
connector
cpufreq	[CPUFREQ] fix brace coding style issue.	2010-08-03 13:47:05 -04:00
cpuidle	[CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent	2010-08-03 13:47:05 -04:00
crypto	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
dca
dio
dma	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
edac	amd64_edac: Minor formatting fix	2010-08-04 11:16:01 +02:00
eisa
firewire
firmware	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6	2010-08-04 11:25:58 -07:00
gpio
gpu	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2010-08-04 15:23:49 -07:00
hwmon
i2c
ide
idle	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq	2010-08-04 11:13:36 -07:00
ieee1394
ieee802154
infiniband	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
input	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
isdn	isdn: gigaset: use after free	2010-08-07 23:04:12 -07:00
leds
lguest
macintosh
mca
md
media	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
memstick
message	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
mfd
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-04 15:15:15 -07:00
mmc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-08-03 14:31:24 -07:00
mtd	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
net	ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG	2010-08-08 20:02:44 -07:00
nubus
of
oprofile
parisc	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
parport
pci
pcmcia	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
platform	ips driver: make it less chatty	2010-08-03 11:55:15 -04:00
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-08-04 15:15:15 -07:00
sbus
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
serial	Merge branch 'master' into for-next	2010-08-04 15:14:38 +02:00
sfi
sh
sn
spi
ssb
staging	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
tc
telephony
thermal
uio
usb	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
uwb
vhost	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
video	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig
Makefile