leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
360c202beb
linux/drivers/staging
History
Andres Salomon e6f597a142 staging: fix build failure in bcm driver 
While building latest Linus git, I hit the following:

    CC [M]  drivers/staging/bcm/Qos.o
  drivers/staging/bcm/Qos.c: In function ‘PruneQueue’:
  drivers/staging/bcm/Qos.c:367: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’
  drivers/staging/bcm/Qos.c: In function ‘flush_all_queues’:
  drivers/staging/bcm/Qos.c:416: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’
  make[5]: *** [drivers/staging/bcm/Qos.o] Error 1
  make[4]: *** [drivers/staging/bcm] Error 2
  make[3]: *** [drivers/staging] Error 2

As well as:

    CC [M]  drivers/staging/bcm/Transmit.o
  drivers/staging/bcm/Transmit.c: In function ‘SetupNextSend’:
  drivers/staging/bcm/Transmit.c:163: error: ‘struct netdev_queue’ has no member named ‘tx_bytes’
  drivers/staging/bcm/Transmit.c:164: error: ‘struct netdev_queue’ has no member named ‘tx_packets’
  make[2]: *** [drivers/staging/bcm/Transmit.o] Error 1

tx_dropped/tx_bytes_tx_packets were removed in commit 1ac9ad13.  This patch
converts bcm to use net_device_stats instead of netdev_queue.

Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-17 17:39:39 -08:00
..
asus_oled Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ath6kl drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
autofs Add a dentry op to allow processes to be held during pathwalk transit 2011-01-15 20:07:31 -05:00
bcm staging: fix build failure in bcm driver 2011-01-17 17:39:39 -08:00
brcm80211 staging: brcm80211: Fix WL_<type> logging macros 2010-12-16 12:25:37 -08:00
comedi Staging: comedi: Fix checkpatch.pl issues in file s526.c 2010-12-16 12:20:06 -08:00
cptm1217 staging: clearpad_tm1217 depends on INPUT 2010-11-19 17:17:45 -08:00
crystalhd drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
cs5535_gpio cs5535: deprecate older cs5535_gpio driver 2011-01-13 08:03:13 -08:00
cx25821 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
cxt1e1 Staging: cxt1e1: rename global log_level variable 2010-12-10 10:46:30 -08:00
dabusb [media] dabusb: Move it to staging to be deprecated 2010-12-29 08:17:15 -02:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
echo
et131x drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
frontier Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ft1000 staging: ft1000: Fix kernel panic when use ioctl. 2010-12-16 12:20:05 -08:00
go7007 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
hv Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize 2010-12-16 12:37:51 -08:00
iio Staging: IIO: DDS: AD9833 / AD9834 driver 2010-12-16 12:23:03 -08:00
intel_sst Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
keucr Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
line6 staging/line6: Fix sparse warning 'Using plain integer as NULL pointer' 2010-12-08 14:31:01 -08:00
lirc Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2011-01-07 17:02:58 -08:00
memrar Staging: sep: handle the memrar stuff in the headers 2010-11-29 11:17:27 -08:00
msm Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison Staging: phison: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
pohmelfs pohmelfs: double-free and leak 2011-01-12 20:02:44 -05:00
quatech_usb2
quickstart Staging: quickstart: free after input_unregister_device() 2010-11-16 12:25:52 -08:00
rt2860 Staging: rt2860: Sanitize DBGPRINT_ERR macro 2010-12-16 12:17:29 -08:00
rt2870 Staging: rt2870: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:46 -07:00
rtl8187se staging: rtl8187se: Change panic to warn when RF switch turned off 2010-11-16 12:25:53 -08:00
rtl8192e Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
rtl8192u Staging: rtl8192u: add missing curly braces 2010-12-10 10:39:55 -08:00
rtl8712 Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
samsung-laptop Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
sbe-2t3e3 Staging: sbe-2t3e3: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
se401 [media] staging: se401 depends on USB 2010-12-30 22:29:41 -02:00
sep staging: sep: fix comments in sep_get_static_pool_addr_handler 2010-12-10 10:39:55 -08:00
serqt_usb2
slicoss staging: slicoss: use free_netdev(netdev) instead of kfree() 2010-09-30 04:14:21 -07:00
sm7xx Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-01-14 09:29:05 -08:00
smbfs staging: smbfs building fix 2011-01-17 01:50:52 -05:00
solo6x10 staging: solo6010 depends on I2C 2010-12-09 16:29:49 -08:00
speakup Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
spectra Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ste_rmi4 staging: fix ste_rmi4 build, depends on INPUT 2010-11-16 12:31:48 -08:00
ti-st staging: ti-st: move TI_ST from staging to misc/ 2010-10-06 08:25:06 -07:00
tidspbridge Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
tm6000 [media] tm6000: Fix mutex unbalance 2010-12-29 08:17:21 -02:00
usbip staging: usbip: remove double giveback of URB 2011-01-10 12:26:02 -08:00
usbvideo [media] staging: usbvideo/vicam depends on USB 2010-12-30 22:29:39 -02:00
vme Staging: vme_tsi148: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:47 -08:00
vt6655 drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
vt6656 drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
westbridge Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
winbond Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wlags49_h2 drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
wlags49_h25 Staging: wlags49_h25: Makefile: cleaned up Makefile cflag lines 2010-10-05 11:56:38 -07:00
wlan-ng Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
xgifb staging: Use vzalloc 2010-11-09 16:34:01 -08:00
zram Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
Kconfig cs5535: deprecate older cs5535_gpio driver 2011-01-13 08:03:13 -08:00
Makefile cs5535: deprecate older cs5535_gpio driver 2011-01-13 08:03:13 -08:00
staging.c