aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 'staging-next' to Linus's treeGreg Kroah-Hartman2010-10-281365-148540/+421108
|\ | | | | | | | | | | | | | | This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.Henry Ptasinski2010-10-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The basename-apiversion-codeversion construction for firmware filenames is not used by most other firmware files, adds complexity, and is not providing any value. Rename the firmware files using just basename-apiversion. Users of the brcmfmac driver will need to update the linux-firmware package to get the renamed files, or manually rename their installed firmware files. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: Remove unnecessary header files.Henry Ptasinski2010-10-212-101/+0
| | | | | | | | | | | | | | These header files are no longer needed. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: Remove unnecessary includes from bcmutils.cHenry Ptasinski2010-10-211-2/+0
| | | | | | | | | | | | | | Removed includ of bcmip.h and vlan.h, as they're no longer needed. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: Removed unnecessary pktsetprio() function.Henry Ptasinski2010-10-213-77/+0
| | | | | | | | | | | | | | | | | | This function is completely unnecessary, as packet classification is done higher up in the stack. As used, the function actually mis-classifies frames in some cases since it overwrites the classification done by the stack. Signed-off-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: brcm80211: remove typedefs.hGreg Kroah-Hartman2010-10-2169-185/+91
| | | | | | | | | | | | | | | | | | | | | | | | It's not needed anymore, so remove it and clean up the .h inclusion mess a bit to get everything to build properly again. Wow, this needs some unwinding... Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: brcm80211: remove uintptr typedef usageGreg Kroah-Hartman2010-10-2118-82/+68
| | | | | | | | | | | | | | | | | | | | Use a unsigned long, that is the proper type for this type of thing on Linux. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-218-72/+1
| | | | | | | | | | | | | | | | | | | | Now that no one uses this structure, remove it, and channel_interface.c (which is now empty) and the function, vmbus_get_interface() which is not needed anymore either. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove Open from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-17/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: storvsc: call vmbus_open directlyGreg Kroah-Hartman2010-10-211-7/+5
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_open directlyGreg Kroah-Hartman2010-10-211-6/+3
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_open to modulesGreg Kroah-Hartman2010-10-211-0/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove Close from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-8/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_close directlyGreg Kroah-Hartman2010-10-211-4/+4
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: storvsc: call vmbus_close directlyGreg Kroah-Hartman2010-10-211-1/+1
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_close to modulesGreg Kroah-Hartman2010-10-211-0/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove SendPacket from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-12/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: storvsc: call vmbus_sendpacket directlyGreg Kroah-Hartman2010-10-211-36/+30
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_sendpacket directlyGreg Kroah-Hartman2010-10-211-44/+35
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove SendPacketPageBuffer from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-16/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_sendpacket_pagebuffer directlyGreg Kroah-Hartman2010-10-211-6/+6
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_sendpacket_pagebuffer to modulesGreg Kroah-Hartman2010-10-211-0/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove SendPacketMultiPageBuffer from struct ↵Greg Kroah-Hartman2010-10-212-16/+0
| | | | | | | | | | | | | | | | | | | | vmbus_channel_interface No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: storvsc: call vmbus_sendpacket_multipagebuffer directlyGreg Kroah-Hartman2010-10-211-2/+1
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_sendpacket_multipagebuffer to modulesGreg Kroah-Hartman2010-10-211-1/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove RecvPacket from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-12/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: storvsc: call vmbus_recvpacket directlyGreg Kroah-Hartman2010-10-211-4/+4
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove RecvPacketRaw from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-12/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_receivepacket_raw directlyGreg Kroah-Hartman2010-10-211-3/+2
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_receivepacket_raw to modulesGreg Kroah-Hartman2010-10-211-0/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: rename context to channel in struct hv_deviceGreg Kroah-Hartman2010-10-216-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As it really is a channel, not a "context" name it so. This also entailed making a few more functions typesafe as they were sending a struct vmbus_channel pointer as a void pointer. There are still a few more that need to be converted (the osd callbacks are one), but this is good for now. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: make *context a real pointer in struct hv_deviceGreg Kroah-Hartman2010-10-211-1/+1
| | | | | | | | | | | | | | | | | | This is really the struct vmbus_channel for the device, not a void pointer, so use the real structure to ensure type safety everywhere. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove EstablishGpadl from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-11/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_establish_gpadl directlyGreg Kroah-Hartman2010-10-211-8/+6
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_establish_gpadl to modulesGreg Kroah-Hartman2010-10-211-0/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove TeardownGpadl from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-212-10/+0
| | | | | | | | | | | | | | | | No one calls it anymore, so remove it. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: netvsc: call vmbus_teardown_gpadl directlyGreg Kroah-Hartman2010-10-211-5/+5
| | | | | | | | | | | | | | | | Don't do the interface indirection, it's not needed at all. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: channel: export vmbus_teardown_gpadl to modulesGreg Kroah-Hartman2010-10-211-0/+1
| | | | | | | | | | | | | | | | | | Drivers need to call this directly, so export it, like other vmbus functions. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: make get_channel_info staticGreg Kroah-Hartman2010-10-204-77/+42
| | | | | | | | | | | | | | | | | | | | | | This is done by moving it to the only .c file it is used in. This also allowed us to delete the channel_interface.h file, as it's no longer needed. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: vmbus_drv: remove vmbus_child_device_get_infoGreg Kroah-Hartman2010-10-201-14/+1
| | | | | | | | | | | | | | | | Just make the call to get_channel_info() directly. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove GetChannelInfo from struct vmbus_driverGreg Kroah-Hartman2010-10-203-7/+2
| | | | | | | | | | | | | | | | | | It was only set to one value, so just make the call to get_channel_info() directly. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove GetInfo pointer from struct vmbus_channel_interfaceGreg Kroah-Hartman2010-10-202-3/+0
| | | | | | | | | | | | | | | | It's only set by one thing, and never called. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: remove VmbusGetChannelInfoGreg Kroah-Hartman2010-10-201-10/+1
| | | | | | | | | | | | | | | | | | It's not needed, make the function pointer point to get_channel_info() instead. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: hv: make alloc_channel staticGreg Kroah-Hartman2010-10-202-3/+1
| | | | | | | | | | | | | | | | It's only used in one file, and is a pretty generic name. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: batman-adv: remove useless addr_to_string()Andy Shevchenko2010-10-208-38/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | Since all *printf() methods in the kernel understand '%pM' modifier the conversion to the string is useless beforehand. Additionally this patch decreases batman_if structure by 20 bytes. Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Marek Lindner <lindner_marek@yahoo.de> Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Cc: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: brcmfmac: add debugfs, display wi-fi statisticsnohee ko2010-10-192-0/+44
| | | | | | | | | | | | | | | | | | | | | | Add debugfs to display wi-fi profile/statistics. Initially some profile parameters such as dtim_period, beacon_int will be seen at /sys/kernel/debug/ieee80211/phy#/netdev:eth#. This will provide users with current connection status. Signed-off-by: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: brcmfmac: add profile, beacon_int, dtim_periodnohee ko2010-10-192-2/+44
| | | | | | | | | | | | | | | | Add profile, beacon_int & dtim_period. This profile can be seen through debugfs. Signed-off-by: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: brcmfmac: enable passive, active scan selectionnohee ko2010-10-192-27/+37
| | | | | | | | | | | | | | | | | | | | Enable passive, active scan selection. Previously it did active scan and reported probe response result regardless of active_scan flag Signed-off-by: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * staging: brcm80211: brcmfmac: remove unnecessary cflags, WL_ISCAN_DISABLED & ↵nohee ko2010-10-191-9/+1
| | | | | | | | | | | | | | | | | | | | | | WL_ROAM_DISABLED Remove unnecessary cflags, WL_ISCAN_DISABLED and WL_ROAM_DISABLED. Iscan is ON and Roam by FW is OFF by default. Signed-off-by: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: frontier: fix coding style issues in tranzport.cGustavo Silva2010-10-191-27/+27
| | | | | | | | | | | | | | | | | | This is a patch to the tranzport.c file that fixes up the following issue WARNING: please, no space for starting a line x 23 Signed-off-by: Gustavo Silva <silvagustavo@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>