summaryrefslogtreecommitdiff
path: root/drivers/staging/bcm
AgeCommit message (Collapse)Author
2011-01-18staging: fix build failure in bcm driverAndres Salomon
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-11Merge branch 'staging-next' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits) staging: speakup: fix failure handling staging: usbip: remove double giveback of URB Staging: batman-adv: Remove batman-adv from staging Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize staging: hv: remove unneeded osd_schedule_callback staging: hv: convert channel_mgmt.c to not call osd_schedule_callback staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback staging: brcm80211: Fix WL_<type> logging macros Staging: IIO: DDS: AD9833 / AD9834 driver Staging: IIO: dds.h convenience macros Staging: IIO: Direct digital synthesis abi documentation staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr staging: brcm80211: Remove unused ether_<foo> #defines and struct staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR Staging: comedi: Fix checkpatch.pl issues in file s526.c ... Fix up trivial conflict in drivers/video/udlfb.c
2010-12-16Merge branch 'usb-next' into musb-mergeGreg Kroah-Hartman
* usb-next: (132 commits) USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added usb: gadget: f_ncm.c added usb: gadget: u_ether: prepare for NCM usb: pch_udc: Fix setup transfers with data out usb: pch_udc: Fix compile error, warnings and checkpatch warnings usb: add ab8500 usb transceiver driver USB: gadget: Implement runtime PM for MSM bus glue driver USB: gadget: Implement runtime PM for ci13xxx gadget USB: gadget: Add USB controller driver for MSM SoC USB: gadget: Introduce ci13xxx_udc_driver struct USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc USB: gadget: Separate out PCI bus code from ci13xxx_udc ...
2010-12-07Staging: Beceem: more checkpatch.pl changes to InterfaceInit.cDan Carpenter
The only checkpatch.pl issues remaining still remaining are line length complaints. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07Staging: Beceem: improve debug printk statementsDan Carpenter
These are just small changes. Some grammar and wording changes. I added new lines to the end of all the print statements. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07Staging: Beceem: use after free in bcm_exit()Dan Carpenter
We can't call class_destroy() until after the driver has been deregistered. It leads to a NULL deref on module unload. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07Staging: Beceem: remove old kernel compatibility codeDan Carpenter
This drops compatability for everything from 2.4 to 2.6.35. Now it only works on the latest kernel. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07Staging: Beceem: white space changes to InterfaceInit.cDan Carpenter
This patch only changes: 1) spaces, tabs, and newline characters. 2) comment styles. The compiled object file is the same before and after except for line number changes. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07Staging: Beceem: use lower case "int" instead of "INT"Dan Carpenter
This patch changes: INT => int ULONG => unsigned long VOID => void Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07Staging: Beceem: add USB id for BCSM250 Mobile WiMAXDan Carpenter
Signed-off-by: Dan Carpenter <error27@gmail.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-17USB: fix leftover references to udev->autosuspend_delayAlan Stern
This patch (as1436) takes care of leftover references to udev->autosuspend_delay that didn't get removed during the earlier conversion to the runtime-PM autosuspend API. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: bcm: signedness bug in InitCardAndDownloadFirmware()Dan Carpenter
status is used to store negative error codes throughout. The only place where this is a runtime bug is if create_worker_threads() fails. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: bcm: signedness bug in StoreSFParam()Dan Carpenter
wrm() returns negative error codes so "ret" needs to be signed here. There was place where wrm() returned positive EACCES instead of negative -EACCES so I fixed that as well. Also a few checkpatch.pl issues. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16drivers/staging: Remove unnecessary semicolonsJoe Perches
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-16Staging: Merge 2.6.37-rc2 into staging-nextGreg Kroah-Hartman
This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drivers/staging/intel_sst/intel_sst_app_interface.c All should be resolved now. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-11Staging, bcm: Remove unnecessary casts of void ptr returning alloc function ↵Jesper Juhl
return values Here's a patch against a copy of linux-next that I just cloned. Don't pointlessly cast pointers returned by allocation functions that return void pointers which are implicitly converted. For drivers/staging/bcm/ Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-11Staging: beceem: Move ZTE TU25's USB id to the beceem moduleAlejandro R. Sedeño
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-11Staging: beceem: Use 32-bit integers for hardware register valuesAlejandro R. Sedeño
Switching to UINT because that's what the rest of this codebase uses. Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09Staging: bcm: use get_user() to access user pointersDan Carpenter
This fixes some places that dereference user pointers directly instead of using get_user(). Please especially check my changes to IOCTL_BCM_GET_CURRENT_STATUS. The original code modified the struct which "arg" was pointing to. I think this was a bug in the original code and that we only wanted to write to the OutputBuffer. Also with the original code you could read as much memory as you wanted so I had to put a cap on OutputLength. The only value of OutputLength that makes sense is sizeof(LINK_STATE) so now if OutputLength is not sizeof(LINK_STATE) it returns -EINVAL. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-01beceem: update TODO listStephen Hemminger
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: dump control packet informationStephen Hemminger
Add control packet information is useful for debugging. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: change startup messagesStephen Hemminger
Change the regsister/unregister routines to generate better messages, and control arrival of new frames when USB device is unplugged. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: don't overrun user buffer on readStephen Hemminger
Serious bug in original code, if app reads 10 bytes but 20 byte msg received memory would get overwritten. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: eliminate unused bcm_jiffiesStephen Hemminger
Unused, unneeded, and bogus. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: fix definition of VLAN header typeStephen Hemminger
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: statistics and transmit queue changesStephen Hemminger
Use standard network statistics variables and routines. Transmit counters are per queue, and skb mapping is already in skb and does not need to be recomputed. Move SearchVcId to only place it is used. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: do classification even if device is offlineStephen Hemminger
Since classification and queue control are separate, allow classification even if device is down now; this avoids races on startup/shutdown. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: off by one on queue indexStephen Hemminger
The driver allocates 18 queues (0..16) are for traffic, and 17 is a bit bucket. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: make local functions staticStephen Hemminger
Use namespace tool from kernel scripts to identify dead code and functions that should be static. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: remove unused code to dump headerStephen Hemminger
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: transmit code cleanupStephen Hemminger
Eliminate global variable in transmit path The Leader can be on the stack, and get rid of unnecessary timeval. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: allow multicast/broadcastStephen Hemminger
Even though wimax isn't really a broadcast medium, pretend it is. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: debug message format changesStephen Hemminger
Add more debug messages and make them similar to other drivers Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: use get_seconds for elapsed timeStephen Hemminger
get_seconds is lower overhead and fine if all driver wants to do is keep track of seconds. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: module initializationStephen Hemminger
Get rid of boot messages and put in correct place. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: add network device message level controlStephen Hemminger
Provide standard interface to control verbosity of debug messages Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: change format of debug messageStephen Hemminger
Statistic point is now u32 (like it has to be). Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: clean up adapter structureStephen Hemminger
Remove dead fields, change fields that only have true/false to boolean; and rearrange to save space. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: create class on module installationStephen Hemminger
First step to supporting multiple devices, create device class when module is initialized. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: convert to kernel coding styleStephen Hemminger
Change indentation etc, to conform to acceptable kernel style Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: remove useless debug function entry messagesStephen Hemminger
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: remove problematic debug print messagesStephen Hemminger
Not worth bothering to change printf format of messages which are basically noise. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: remove unnecessary usb classStephen Hemminger
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: fix character device ioctlStephen Hemminger
Sparse caught several places where ioctl interface was incorrectly using user memory. Fix all the ioctl cases for casting and __user annotation. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: fix printf format stringsStephen Hemminger
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: reserve one queue for bit-bucketStephen Hemminger
This preserves the semantics of the original driver (unclassified packets are dropped), but does it in a clean way; and fixes crash when packet is sent to offline device. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: remove dead codeStephen Hemminger
Remove commented out with '#if 0' Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: support multiple queuesStephen Hemminger
Current kernels have multi-queue support which can be used by this device. This has the advantage that a single type of traffic will not block other types. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: get rid of unnecessary inline usageStephen Hemminger
Many routines were tagged with inline_ but GCC does a better job of deciding this. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2010-11-01beceem: fold unregister_netdevice into AdapterFreeStephen Hemminger
The function unregister_netdevice only called unregister_netdev. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>