summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-10-06staging: brcm80211: removed accessor functions for band type and etheraddress.Alwin Beukers1-16/+5
Functions were trivial so not really adding value. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: fixed checkpatch warningsAlwin Beukers4-14/+9
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: stop using assigned thread priority in fullmacFranky Lin1-55/+5
Stop assigning priority to watchdog and dpc threads. Remove related code. Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: remove fullmac module_param for intr/poll modeFranky Lin1-10/+2
Use constant for interrupt/polling mode configuration. Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: clean up rtnl_lock in fullmacFranky Lin2-22/+5
rtnl lock is used improperly in fullmac. This patch intends to clean them up. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Sukesh Srikakula <sukeshs@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: fullmac: fixed double #includeRoland Vossen1-1/+0
Fix double include as detected by checkincludes script. Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: replace brcmu_bitcount with hweight8Arend van Spriel2-9/+8
The kernel provides bit operations to replace brcmu_bitcount so using those instead. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: remove brcmu_bprintf and related functionsArend van Spriel3-50/+0
The functions brcmu_bprintf and brcmu_binit could be replaced by snprintf kernel function. These are no longer used in both brcm80211 drivers so they have been removed. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: remove filtering of received framesArend van Spriel1-22/+1
In the receive path of the brcmsmac driver probe request frames and frames with invalid mac address fields are dropped. This is only fine for STA mode. Anticipating coming AP and monitor mode functionality this is unwanted behavior. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: remove setting ssn to zero upon AMPDU_TX_STARTArend van Spriel1-5/+0
The ssn should be given a valid value by the driver or it should not override the value. Removed override to zero from the driver. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-06staging: brcm80211: cleaned up struct brcms_bss_cfgRoland Vossen2-167/+3
Several fields were unused or were only set once. They have been removed. Uncalled functions that relied on these constants have been removed as well. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-05Merge branch 'for-linus' of git://github.com/dtor/inputLinus Torvalds1-5/+2
* 'for-linus' of git://github.com/dtor/input: Input: wacom - revert "Cintiq 21UX2 does not have menu strips"
2011-10-05Merge git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6Linus Torvalds2-8/+11
* git://bedivere.hansenpartnership.com/git/scsi-rc-fixes-2.6: [SCSI] libsas: fix panic when single phy is disabled on a wide port [SCSI] qla2xxx: Fix crash in qla2x00_abort_all_cmds() on unload
2011-10-05drm/radeon/kms: fix dp_detect handling for DP bridge chipsAlex Deucher1-15/+6
The HPD pin is not reliable for detecting whether a monitor is connected or not. Skip HPD and just use DDC or load detection. Fixes phantom VGA connected bugs. [Michel: fixes phantom VGA bugs on his llano system.] Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Tested-by: Michel Dänzer <michel.daenzer@amd.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-10-05drm/radeon/kms: retry aux transactions if there are status flagsAlex Deucher1-3/+9
If there are error flags in the aux status, retry the transaction. This makes aux much more reliable, especially on llano systems. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-10-05Input: wacom - revert "Cintiq 21UX2 does not have menu strips"Jason Gerecke1-5/+2
This reverts commit 71c86ce59791bcd67af937bbea719a508079d7c2. The 21UX2 does have touchstrips, but they are in a somewhat- hidden location. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Acked-by: Ping Cheng <pinglinux@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
2011-10-05tcp: properly update lost_cnt_hint during shiftingYan, Zheng1-3/+1
lost_skb_hint is used by tcp_mark_head_lost() to mark the first unhandled skb. lost_cnt_hint is the number of packets or sacked packets before the lost_skb_hint; When shifting a skb that is before the lost_skb_hint, if tcp_is_fack() is ture, the skb has already been counted in the lost_cnt_hint; if tcp_is_fack() is false, tcp_sacktag_one() will increase the lost_cnt_hint. So tcp_shifted_skb() does not need to adjust the lost_cnt_hint by itself. When shifting a skb that is equal to lost_skb_hint, the shifted packets will not be counted by tcp_mark_head_lost(). So tcp_shifted_skb() should adjust the lost_cnt_hint even tcp_is_fack(tp) is true. Signed-off-by: Zheng Yan <zheng.z.yan@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2011-10-05tcp: properly handle md5sig_pool referencesYan, Zheng2-7/+12
tcp_v4_clear_md5_list() assumes that multiple tcp md5sig peers only hold one reference to md5sig_pool. but tcp_v4_md5_do_add() increases use count of md5sig_pool for each peer. This patch makes tcp_v4_md5_do_add() only increases use count for the first tcp md5sig peer. Signed-off-by: Zheng Yan <zheng.z.yan@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2011-10-05macvlan/macvtap: Fix unicast between macvtap interfaces in bridge modeDavid Ward1-1/+1
Packets should always be forwarded to the lowerdev using dev_forward_skb. vlan->forward is for packets being forwarded directly to another macvlan/ macvtap device (used for multicast in bridge mode). Reported-and-tested-by: Shlomo Pongratz <shlomop@mellanox.com> Signed-off-by: David Ward <david.ward@ll.mit.edu> Signed-off-by: David S. Miller <davem@davemloft.net>
2011-10-05Linux 3.1-rc9Linus Torvalds1-1/+1
2011-10-04staging: et131x: Fix indefinite low power sleepMark Einon2-5/+12
The mechanism by which the device is put into low power sleep is broken in that the device can never come back out of low power mode afterwards. Temorary fix to bring the device back out of sleep almost immediately, until a suitable wake trigger can be found. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Updating copyright statements and module authorsMark Einon16-3/+31
Adding copyright notices and adding myself as a module author. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Update TODO file for kernel parametersMark Einon1-1/+0
set_mac is implemented, and there have been lots of new ethtool_ops added, so removing the TODO to add more kernel parameters. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Fix add_timer() from et131x_openMark Einon4-8/+5
The error_timer was only getting initialised and an initial jiffies value set following a probe. This could result in the timer needlessly expiring immediately after et131x_open is called. Now this is all done from the open call instead. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Add pci suspend & resume functionsMark Einon3-3/+45
Added basic suspend & resume functionality. Tested on an et1310 device, and putting Fedora15 host in and out of hibernation successfully. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Remove adapter->bmsr, replace with phydev equivalentsMark Einon3-10/+3
adapter->bmsr is no longer being updated, but is also used to check the link state in places. Remove bmsr from adapter, and replace link state checks with phydev->link check. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Introduce et1310_in_phy_coma() callMark Einon5-22/+28
In several places in the code, the pm_csr register is read and the PHY_SW_COMA bit checked. Move this check into its own small function to make the code more readable. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: et131x: Remove TODO entry 'alloc_etherdev initilising memory with zero'Mark Einon1-1/+0
Removing this as I'm pretty sure its not true, and alloc_etherdev isn't provided by this driver anyway. Alternatively, its a badly written comment and I don't understand it. This drivers use of alloc_etherdev() is within keeping with other net devices, so I'm happy. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: wlags49_h2: Remove bad debug messageDavid Kilroy1-1/+0
The message is in the wrong place. We definitely don't want to return at this point, as we may need to turn off encryption. Reported-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: David Kiroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: wlags49_h2: Remove unused debug functionDavid Kilroy1-114/+0
The function no longer compiles, so we just remove it. Reported-by: Henk de Groot <pe1dnn@amsat.org> Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04staging: wlags49_h2: Use C99 __func__David Kilroy2-28/+35
in DBG machinery so you don't have to declare DBG_FUNC at the start of all functions. This just makes it easy to add DBG conforming to existing code. The patch reformats the changed #defines to satisfy checkstyle.pl Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of unnecessary commentsK. Y. Srinivasan1-21/+0
Get rid of unnecessary comments. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Enable autoloading of the mouse driverK. Y. Srinivasan1-4/+1
Now that the mouse driver is functional, enable the auto-loading of the driver. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Cleanup mousevsc_on_device_add()K. Y. Srinivasan1-7/+2
Cleanup mousevsc_on_device_add(). Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of mousevsc_on_receive_input_report() by inliningK. Y. Srinivasan1-19/+8
Get rid of mousevsc_on_receive_input_report() by inlining the code. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Cleanup camel cased enumsK. Y. Srinivasan1-17/+17
Cleanup all camel cased names. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of ref_count state in struct mousevsc_devK. Y. Srinivasan1-51/+3
Now get rid of the machinery for managing the life-cycle of the mousevsc_dev as this is not needed. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Now cleanup mousevsc_remove()K. Y. Srinivasan1-50/+3
Now, cleanup mousevsc_remove(). The mouse driver once initialized only receives data from the host. So, by closing the channel first in the unload path, we can properly deal with inflight packets. So, we don't need the machinery for managing the life-cycle of the mousevsc_dev object. Get rid of the unnecessary code. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of mousevsc_on_device_remove() by inlining codeK. Y. Srinivasan1-30/+17
Get rid of mousevsc_on_device_remove() by inlining code. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Cleanup mousevsc_connect_to_vsp()K. Y. Srinivasan1-33/+1
Cleanup mousevsc_connect_to_vsp(). There is no need to take reference on the mousevsc device object when we are setting up the device. As part of this cleanup get rid of get_input_device() as this function is only used here. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of mousevsc_on_send_completion()K. Y. Srinivasan1-21/+0
We don't need to handle the "send complete" callback - nothing needs to be done here; get rid of the code. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Cleanup alloc_input_device()K. Y. Srinivasan1-1/+1
Cleanup alloc_input_device(); you can directly set the reference count. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of the unused state: num_outstanding_reqK. Y. Srinivasan1-3/+0
Get rid of the unused state: num_outstanding_req in struct mousevsc_dev. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Free allocated memory in free_input_device()K. Y. Srinivasan1-0/+2
Free all allocated memory in free_input_device(). Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of unnecessary pr_* callsK. Y. Srinivasan1-53/+11
Get rid of unnecessary pr_* calls. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Cleanup error handlingK. Y. Srinivasan1-16/+7
Cleanup error handling in this driver; use standard Linux error codes. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Get rid of unnecessary DPRINT callsK. Y. Srinivasan1-15/+3
Get rid of unnecessary DPRINT calls. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Cleanup and properly implement reportdesc_callback()K. Y. Srinivasan1-33/+23
Cleanup and properly implement reportdesc_callback(); properly allocate the hid_device and properly initialize the hid device structure. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Use completion primitive to synchronizeK. Y. Srinivasan1-20/+10
Use completion primitive to synchronize. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-04Staging: hv: mousevsc: Correctly initialize the header sizeK. Y. Srinivasan1-1/+1
Correctly initialize the header size. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>