aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-071-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (44 commits) OMAP4: PM: Tesla (DSP) power domain doesn't transition to OFF OMAP4: PM: dont program to greater LP state on suspend OMAP4: PM: dont restore to greater LP state on resume OMAP4: PM: Dont write to readonly/reserved powerdomain register on resume OMAP4: PM: Skip resume powerdomain programing if state already achieved OMAP4: PM: Honor powerdomain wakeup ON state in resume reprogramming OMAP4: PM: Skip programming CPU states again on resume OMAP4: PM: Print achieved state on failed transition OMAP4: PM: Refactor resume pd programing OMAP4: PM: Fold saving power state with programming suspend state OMAP4: PM: Restore trim configuration before DPLL restore GPIO: OMAP: set edge trigger for wakeup gpio GPIO: OMAP: Fix GPIO_IRQWAKEN_0 access netfilter: xt_qtaguid: Fix the stats info display order omap: remoteproc: update suspend flag address omap: rpmsg: remove call to rproc_last_busy from mbox callback remoteproc: move remoteproc register dump before error notification remoteproc: make rproc_set_secure a blocking call omap4: add a new misc driver for setting secure mode omap: remoteproc: enable setting iommu ttb ... Change-Id: I05e426b5d2da76f5ba88b6196f268f9744c5f559 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * netfilter: xt_qtaguid: Fix the stats info display orderAshish Sharma2011-10-061-6/+6
| | | | | | | | | | Change-Id: I3bf165c31f35a6c7dc212f23df5eefaeb8129d0d Signed-off-by: Ashish Sharma <ashishsharma@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-10-043-11/+34
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: OMAP: L3 STD exhaustive debug OMAP4: Fix reg offsets for CLK2 domain OMAP:DSS2: Fix FIFO threshold calculation OMAP DSS: FIFO Threshold Optimization OMAP4: DSS: Enable bufferfilling by default netfilter: ipv6: fix crash caused by ipv6_find_hdr() netfilter: xt_qtaguid: add missing tracking for no filp case Change-Id: I6e3ef85f80b58a25108ba8f747eb32e4e362d307 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * netfilter: ipv6: fix crash caused by ipv6_find_hdr()JP Abgrall2011-09-301-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling: ipv6_find_hdr(skb, &thoff, -1, NULL) on a fragmented packet, thoff would be left with a random value causing callers to read random memory offsets with: skb_header_pointer(skb, thoff, ...) Now we force ipv6_find_hdr() to return a failure in this case. Calling: ipv6_find_hdr(skb, &thoff, -1, &fragoff) will set fragoff as expected, and not return a failure. Change-Id: Ib474e8a4267dd2b300feca325811330329684a88 Signed-off-by: JP Abgrall <jpa@google.com>
| * netfilter: xt_qtaguid: add missing tracking for no filp caseJP Abgrall2011-09-292-5/+26
| | | | | | | | | | | | | | | | | | | | In cases where the skb would have an sk_socket but no file, that skb would not be counted at all. Assigning to uid 0 now. Adding extra counters to track skb counts. Change-Id: If049b4b525e1fbd5afc9c72b4a174c0a435f2ca7 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-09-274-196/+449
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: ARM: omap4: cpuidle: use cpu_pm to save VFP registers ARM: vfp: Use cpu pm notifiers to save vfp state ARM: Enable CPU_PM notifiers on ARM machines. cpu_pm: call notifiers during suspend cpu_pm: Add cpu power management notifiers remoteproc: update hard-coded core file attributes ASoC: ABE: Disable ASRC for BT and MM Ext. misc: omap_temp_sensor: print temp readings when exceeding threshold gpu: pvr: Update to DDK 1.8@293295 netfilter: xt_qtaguid: fix crash after using delete ctrl command Change-Id: Ib262a45fea2cf644873893331e5ca0f2f1574512 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * netfilter: xt_qtaguid: fix crash after using delete ctrl commandJP Abgrall2011-09-254-196/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Crash fix The delete command would delete a socket tag entry without removing it from the proc_qtu_data { ..., sock_tag_list, }. This in turn would cause an exiting process to crash while cleaning up its matching proc_qtu_data. * Added more aggressive tracking/cleanup of proc_qtu_data This should allow one process to cleanup qtu_tag_data{} left around from processes that didn't use resource tracking via /dev/xt_qtaguid. * Debug printing tweaks Better code inclusion/exclusion handling, and extra debug out of full state. Change-Id: I735965af2962ffcd7f3021cdc0068b3ab21245c2 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-09-213-60/+165
|\ \ | |/ | | | | | | | | | | | | Conflicts: sound/soc/omap/sdp4430.c Change-Id: Ie85f02b427da5b556817b4cdebaa92037e5e24b6 Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * netfilter: xt_qtaguid: change WARN_ONCE into pr_warn_onceJP Abgrall2011-09-201-11/+14
| | | | | | | | | | | | | | Make the warning less scary. Change-Id: I0276c5413e37ec991f24db57aeb90333fb1b5a65 Signed-off-by: JP Abgrall <jpa@google.com>
| * netfilter: xt_qtaguid: provide an iface_stat_all proc entryJP Abgrall2011-09-203-49/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a /proc/net/xt_qtaguid/iface/<iface>/{rx_bytes,rx_packets,tx_bytes,...} but for better convenience and to avoid getting overly stale net/dev stats we now have /proc/net/xt_qtaguid/iface_stat_all which outputs lines of: iface_name active rx_bytes rx_packets tx_bytes tx_packets net_dev_rx_bytes net_dev_rx_packets net_dev_tx_bytes net_dev_tx_packets Change-Id: I12cc10d2d123b86b56d4eb489b1d77b2ce72ebcf Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-09-166-40/+172
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: ARM: omap4: opp: disable OPP100_OV for gpu OMAP: TILER: Correct usage of get_user_pages ASoC: twl6040: Create virtual mux for Earphone Playback ASoC: DSP: Skip querying audio paths of unsupported types ASoC: OMAP ABE: Use correct stream direction for modem DAI ASoC: ABE: Don't trigger modem FE in dsp runtime ASoC: ABE: Add digital mute for FEs ASoC: ABE: Use SDT DL digital mute along with DL1 BEs ASoC: ABE: Add digital mute for BEs ASoC: ABE DSP: Initialize gains to mute state Revert "OMAP DSS: FIFO Threshold Optimization" Revert "OMAP DSS: GFX pipeline to use WB DDMA buffers" Revert "OMAP:DSS2: Fix FIFO threshold calculation" cpufreq: interactive: Fix handling of SMP where CPUs must scale in tandem netfilter: xt_qtaguid: work around devices that reset their stats net: wireless: bcmdhd: Update to Version 5.90.125.84 net: wireless: bcmdhd: Prohibit FW access in case of FW crash net: wireless: Add CFG80211_ALLOW_RECONNECT option
| * netfilter: xt_qtaguid: work around devices that reset their statsJP Abgrall2011-09-154-40/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most net devs will not reset their stats when just going down/up, unless a NETDEV_UNREGISTER was notified. But some devs will not send out a NETDEV_UNREGISTER but still reset their stats just before a NETDEV_UP. Now we just track the dev stats during NETDEV_DOWN... just in case. Then on NETDEV_UP we check the stats: if the device didn't do a NETDEV_UNREGISTER and a prior NETDEV_DOWN captured stats, then we treat it as an UNREGISTER and save the totals from the stashed values. Added extra netdev event debugging. Change-Id: Iec79e74bfd40269aa3e5892f161be71e09de6946 Signed-off-by: JP Abgrall <jpa@google.com>
| * net: wireless: Add CFG80211_ALLOW_RECONNECT optionDmitry Shmidt2011-09-152-0/+13
| | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-09-126-299/+1548
|\ \ | |/ | | | | | | | | | | Conflicts: net/netfilter/xt_qtaguid.c Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * netfilter: xt_qtaguid: warn only once for missing proc qtaguid dataJP Abgrall2011-09-111-4/+18
| | | | | | | | | | | | | | | | When a process doesn't have /dev/xt_qtaguid open, only warn once instead of for every ctrl access. Change-Id: I98a462a8731254ddc3bf6d2fefeef9823659b1f0 Signed-off-by: JP Abgrall <jpa@google.com>
| * netfilter: xt_qtaguid: 1st pass at tracking tag based data resourcesJP Abgrall2011-09-095-297/+1533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added global resource tracking based on tags. - Can be put into passive mode via /sys/modules/xt_qtaguid/params/tag_tracking_passive - The number of socket tags per UID is now limited - Adding /dev/xt_qtaguid that each process should open before starting to tag sockets. A later change will make it a "must". - A process should not create new tags unless it has the dev open. A later change will make it a must. - On qtaguid_resources release, the process' matching socket tag info is deleted. * Support run-time debug mask via /sys/modules parameter "debug_mask". * split module into prettyprinting code, includes, main. * Removed ptrdiff_t usage which didn't work in all cases. Change-Id: I4a21d3bea55d23c1c3747253904e2a79f7d555d9 Signed-off-by: JP Abgrall <jpa@google.com>
| * net: wireless: change the expire time about each entry of scan resultsjun.ho.lee2011-09-091-1/+1
| | | | | | | | | | | | Change-Id: I6e8d838d91bebc28f4cd09dcb8b9f1de775be13d Signed-off-by: jun.ho.lee <jun.ho.lee@samsung.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-09-071-10/+18
|\ \ | |/ | | | | Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * netfilter: qtaguid: fix proc/.../stats uid filtered outputJP Abgrall2011-09-021-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "cat /proc/net/xt_qtaguid/stats" for a non-priviledged UID would output multiple twice its own stats. The fix tweaks the way lines are counted. Non-root: idx iface acct_tag_hex uid_tag_int cnt_set ... 2 wlan0 0x0 10022 0 ... 3 wlan0 0x0 10022 1 ... 4 wlan0 0x3010000000000000 10022 0 ... 5 wlan0 0x3010000000000000 10022 1 ... Root: idx iface acct_tag_hex uid_tag_int cnt_set 2 wlan0 0x0 0 0 ... 3 wlan0 0x0 0 1 ... 4 wlan0 0x0 1000 0 ... ... 12 wlan0 0x0 10022 0 ... 13 wlan0 0x0 10022 1 ... ... 18 wlan0 0x3010000000000000 10022 0 ... 19 wlan0 0x3010000000000000 10022 1 ... Change-Id: I3cae1f4fee616bc897831350374656b0c718c45b Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-08-301-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (50 commits) omap: hwmod: add softreset delay field OMAP4: PM: add context/save restore for sDMA OMAP4: PM: add context/save restore for GPMC OMAP2+: GPMC: make context/save restore APIs generic OMAP4: PM: save gpio context when per loses context GPIO: OMAP: use put_sync_suspend instead of put_sync GPIO: OMAP: setup irq enable only after configuring interrupt in restore GPIO: OMAP: restore OE only after setting the output level GPIO: OMAP: handle set_dataout reg capable IP on restore GPIO: OMAP: save and restore wakeup_set register not status GPIO: OMAP: save and restore debounce as well GPIO: OMAP: mark complete once restored OMAP4: pm-debug: Add device OFF counter OMAP4: PM: Add call to omap4_secure_dispatcher early in CPU0 wake up OMAP4: PM: Work-around for L3INSTR registers for MPU OSWR/OFF mode OMAP4: PM: Work-around for ROM code BUG of IVAHD/TESLA OMAP4: PM: powerdomain: Dont write to readonly/reserved register OMAP4: PM: Add device-off support OMAP2+: pm-debug: reflect true off status OMAP2+: PM: use off_mode_enabled as the global off mode flag ... Conflicts: arch/arm/mach-omap2/Makefile Change-Id: I9c949df385ed25308230a90b4ecf6fe14df2cb34
| * Bluetooth: Fix l2cap conn failures for ssp devicesPeter Hurley2011-08-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 330605423c fixed l2cap conn establishment for non-ssp remote devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security is tested (which was always returning failure on any subsequent security checks). However, this broke l2cap conn establishment for ssp remote devices when an ACL link was already established at SDP-level security. This fix ensures that encryption must be pending whenever authentication is also pending. Change-Id: I6876ea5134e90d1f3d0f84e8ed40b92977b3df64 Signed-off-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-08-291-4/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: rpmsg: serialize transmissions and add proper barriers gpu: pvr: Update to DDK 1.8@279068 gpu: pvr: Update to DDK 1.8@278427 gpu: pvr: Update to DDK 1.8@277528 netfilter: xt_qtaguid: fix dev_stats for missing NETDEV_UNREGISTER fuse: Freeze client on suspend when request sent to userspace Conflicts: drivers/gpu/pvr/pvrversion.h Change-Id: I7f9c4cae75fc6b70c1a330b471802149ecde2370
| * netfilter: xt_qtaguid: fix dev_stats for missing NETDEV_UNREGISTERJP Abgrall2011-08-251-4/+19
| | | | | | | | | | | | | | | | | | | | Turns out that some devices don't call the notifier chains with NETDEV_UNREGISTER. So now we only track up/down as the points for tracking active/inactive transitions and saving the get_dev_stats(). Change-Id: I948755962b4c64150b4d04f294fb4889f151e42b Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2011-08-231-9/+82
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * android-omap-3.0: (78 commits) OMAP: EMIF: diable and clear irqs on shutdown and boot OMAP4-SGX: Revise SGX driver DVFS interactions ASoC: ABE DSP: Restore context before seting ABE processing point ASoC: core: Cancel any pending resume before suspending OMAP4: Serial: Add serial_omap_wake_peer function. Revert "OMAP4: Serial: Add serial_omap_wake_peer function." OMAP4: Serial: Add serial_omap_wake_peer function. tiler: fix a use-after free error ARM: Panda: Update PVR SGX flags netfilter: xt_qtaguid: add some tagging/matching stats netfilter: xt_qtaguid: Fix sockfd_put() call within spinlock ASoC: sdp4430: Use complete stream names for aux DAIs ASoC: ABE: Fix stream names for modem DAIs ASoC: DAPM: Include power seq run in critical section panic: Add board ID to panic output OMAP4: serial: introduce uart wakeup function OMAP4: Modify POR Prefetch offset value. serial: omap: uart: allow fine grained control of rts line serial: uart: fix context loss conter check Serial: UART: Disable wakeup events after port shutdown ... Conflicts: arch/arm/mach-omap2/omap4-common.c net/netfilter/xt_qtaguid.c Change-Id: I28333a23f8dc6560b7cb72926b91d099171aedcb
| * netfilter: xt_qtaguid: add some tagging/matching statsJP Abgrall2011-08-191-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /proc/net/xt_qtaguid/ctrl will now show: active tagged sockets: lines of "sock=%p tag=0x%llx (uid=%u)" sockets_tagged, : the number of sockets successfully tagged. sockets_untagged: the number of sockets successfully untagged. counter_set_changes: ctrl counter set change requests. delete_cmds: ctrl delete commands completed. iface_events: number of NETDEV_* events handled. match_found_sk: sk found in skbuff without ct assist. match_found_sk_in_ct: the number of times the connection tracker found a socket for us. This happens when the skbuff didn't have info. match_found_sk_none: the number of times no sk could be determined successfully looked up. This indicates we don't know who the data actually belongs to. This could be unsolicited traffic. Change-Id: I3a65613bb24852e1eea768ab0320a6a7073ab9be Signed-off-by: JP Abgrall <jpa@google.com>
| * netfilter: xt_qtaguid: Fix sockfd_put() call within spinlockJP Abgrall2011-08-191-7/+17
| | | | | | | | | | | | | | | | | | sockfd_put() risks sleeping. So when doing a delete ctrl command, defer the sockfd_put() and kfree() to outside of the spinlock. Change-Id: I5f8ab51d05888d885b2fbb035f61efa5b7abb88a Signed-off-by: JP Abgrall <jpa@google.com>
| * netfilter: xt_qtaguid: Fix socket refcounts when taggingJP Abgrall2011-08-171-123/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't hold the sockets after tagging. sockfd_lookup() does a get() on the associated file. There was no matching put() so a closed socket could never be freed. * Don't rely on struct member order for tag_node The structs that had a struct tag_node member would work with the *_tree_* routines only because tag_node was 1st. * Improve debug messages Provide info on who the caller is. Use unsigned int for uid. * Only process NETDEV_UP events. * Pacifier: disable netfilter matching. Leave .../stats header. Change-Id: Iccb8ae3cca9608210c417597287a2391010dff2c Signed-off-by: JP Abgrall <jpa@google.com>
| * Bluetooth: hidp: Don't release device ref if never heldPeter Hurley2011-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | When an hidp connection is added for a boot protocol input device, don't release a device reference that was never acquired. The device reference is acquired when the session is linked to the session list (which hasn't happened yet when hidp_setup_input is called). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| * Bluetooth: hidp: Only free input device if failed registerPeter Hurley2011-08-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | When an hidp connection is added for a boot protocol input device, only free the allocated device if device registration fails. Subsequent failures should only unregister the device (the input device api documents that unregister will also free the allocated device). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| * Bluetooth: hidp: Fix memory leak of cached report descriptorPeter Hurley2011-08-111-0/+1
| | | | | | | | | | | | | | Free the cached HID report descriptor on thread terminate. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| * Bluetooth: hidp: Fix session cleanup on failed conn addPeter Hurley2011-08-111-8/+6
| | | | | | | | | | | | | | | | Once the session thread is running, cleanup must be handled by the session thread only. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| * Bluetooth: bnep: Fix deadlock in session deletionPeter Hurley2011-08-112-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f4d7cd4a4c introduced the usage of kthread API. kthread_stop is a blocking function which returns only when the thread exits. In this case, the thread can't exit because it's waiting for the write lock, which is being held by bnep_del_connection() which is waiting for the thread to exit -- deadlock. Use atomic_t/wake_up_process instead to signal to the thread to exit. Signed-off-by: Jaikumar Ganesh <jaikumar@google.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| * Bluetooth: Don't use cmd_timer to timeout HCI reset commandSzymon Janc2011-08-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | No command should be send before Command Complete event for HCI reset is received. This fix regression introduced by commit 6bd32326cda(Bluetooth: Use proper timer for hci command timout) for chips whose reset command takes longer to complete (e.g. CSR) resulting in next command being send before HCI reset completed. Signed-off-by: Szymon Janc <szymon@janc.net.pl> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* | netfilter: xt_qtaguid: Fix socket refcounts when taggingJP Abgrall2011-08-221-123/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't hold the sockets after tagging. sockfd_lookup() does a get() on the associated file. There was no matching put() so a closed socket could never be freed. * Don't rely on struct member order for tag_node The structs that had a struct tag_node member would work with the *_tree_* routines only because tag_node was 1st. * Improve debug messages Provide info on who the caller is. Use unsigned int for uid. * Only process NETDEV_UP events. * Pacifier: disable netfilter matching. Leave .../stats header. Change-Id: Iccb8ae3cca9608210c417597287a2391010dff2c Signed-off-by: JP Abgrall <jpa@google.com>
* | Bluetooth: hidp: Don't release device ref if never heldPeter Hurley2011-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | When an hidp connection is added for a boot protocol input device, don't release a device reference that was never acquired. The device reference is acquired when the session is linked to the session list (which hasn't happened yet when hidp_setup_input is called). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* | Bluetooth: hidp: Only free input device if failed registerPeter Hurley2011-08-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | When an hidp connection is added for a boot protocol input device, only free the allocated device if device registration fails. Subsequent failures should only unregister the device (the input device api documents that unregister will also free the allocated device). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* | Bluetooth: hidp: Fix memory leak of cached report descriptorPeter Hurley2011-08-221-0/+1
| | | | | | | | | | | | | | Free the cached HID report descriptor on thread terminate. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* | Bluetooth: hidp: Fix session cleanup on failed conn addPeter Hurley2011-08-221-8/+6
| | | | | | | | | | | | | | | | Once the session thread is running, cleanup must be handled by the session thread only. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* | Bluetooth: bnep: Fix deadlock in session deletionPeter Hurley2011-08-222-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f4d7cd4a4c introduced the usage of kthread API. kthread_stop is a blocking function which returns only when the thread exits. In this case, the thread can't exit because it's waiting for the write lock, which is being held by bnep_del_connection() which is waiting for the thread to exit -- deadlock. Use atomic_t/wake_up_process instead to signal to the thread to exit. Signed-off-by: Jaikumar Ganesh <jaikumar@google.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* | Bluetooth: Don't use cmd_timer to timeout HCI reset commandSzymon Janc2011-08-221-2/+4
|/ | | | | | | | | | | No command should be send before Command Complete event for HCI reset is received. This fix regression introduced by commit 6bd32326cda(Bluetooth: Use proper timer for hci command timout) for chips whose reset command takes longer to complete (e.g. CSR) resulting in next command being send before HCI reset completed. Signed-off-by: Szymon Janc <szymon@janc.net.pl> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
* Merge commit 'v3.0.1' into android-3.0Colin Cross2011-08-106-11/+17
|\
| * cfg80211: really ignore the regulatory requestSven Neumann2011-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a203c2aa4cefccb879c879b8e1cad1a09a679e55 upstream. At the beginning of wiphy_update_regulatory() a check is performed whether the request is to be ignored. Then the request is sent to the driver nevertheless. This happens even if last_request points to NULL, leading to a crash in the driver: [<bf01d864>] (lbs_set_11d_domain_info+0x28/0x1e4 [libertas]) from [<c03b714c>] (wiphy_update_regulatory+0x4d0/0x4f4) [<c03b714c>] (wiphy_update_regulatory+0x4d0/0x4f4) from [<c03b4008>] (wiphy_register+0x354/0x420) [<c03b4008>] (wiphy_register+0x354/0x420) from [<bf01b17c>] (lbs_cfg_register+0x80/0x164 [libertas]) [<bf01b17c>] (lbs_cfg_register+0x80/0x164 [libertas]) from [<bf020e64>] (lbs_start_card+0x20/0x88 [libertas]) [<bf020e64>] (lbs_start_card+0x20/0x88 [libertas]) from [<bf02cbd8>] (if_sdio_probe+0x898/0x9c0 [libertas_sdio]) Fix this by returning early. Also remove the out: label as it is not any longer needed. Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> Cc: linux-wireless@vger.kernel.org Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Daniel Mack <daniel@zonque.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * svcrpc: fix list-corrupting race on nfsd shutdownJ. Bruce Fields2011-08-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ebc63e531cc6a457595dd110b07ac530eae788c3 upstream. After commit 3262c816a3d7fb1eaabce633caa317887ed549ae "[PATCH] knfsd: split svc_serv into pools", svc_delete_xprt (then svc_delete_socket) no longer removed its xpt_ready (then sk_ready) field from whatever list it was on, noting that there was no point since the whole list was about to be destroyed anyway. That was mostly true, but forgot that a few svc_xprt_enqueue()'s might still be hanging around playing with the about-to-be-destroyed list, and could get themselves into trouble writing to freed memory if we left this xprt on the list after freeing it. (This is actually functionally identical to a patch made first by Ben Greear, but with more comments.) Cc: gnb@fmeh.org Reported-by: Ben Greear <greearb@candelatech.com> Tested-by: Ben Greear <greearb@candelatech.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * mac80211: Restart STA timers only on associated stateRajkumar Manoharan2011-08-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | commit 676b58c27475a9defccc025fea1cbd2b141ee539 upstream. A panic was observed when the device is failed to resume properly, and there are no running interfaces. ieee80211_reconfig tries to restart STA timers on unassociated state. Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * ethtool: Allow zero-length register dumps againBen Hutchings2011-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 67ae7cf1eeda777f79259c4c6cb17a0bd28dee71 upstream. Some drivers (ab)use the ethtool_ops::get_regs operation to expose only a hardware revision ID. Commit a77f5db361ed9953b5b749353ea2c7fed2bf8d93 ('ethtool: Allocate register dump buffer with vmalloc()') had the side-effect of breaking these, as vmalloc() returns a null pointer for size=0 whereas kmalloc() did not. For backward-compatibility, allow zero-length dumps again. Reported-by: Kalle Valo <kvalo@qca.qualcomm.com> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * bridge: send proper message_age in config BPDUstephen hemminger2011-08-042-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0c03150e7ea8f7fcd03cfef29385e0010b22ee92 upstream. A bridge topology with three systems: +------+ +------+ | A(2) |--| B(1) | +------+ +------+ \ / +------+ | C(3) | +------+ What is supposed to happen: * bridge with the lowest ID is elected root (for example: B) * C detects that A->C is higher cost path and puts in blocking state What happens. Bridge with lowest id (B) is elected correctly as root and things start out fine initially. But then config BPDU doesn't get transmitted from A -> C. Because of that the link from A-C is transistioned to the forwarding state. The root cause of this is that the configuration messages is generated with bogus message age, and dropped before sending. In the standardmessage_age is supposed to be: the time since the generation of the Configuration BPDU by the Root that instigated the generation of this Configuration BPDU. Reimplement this by recording the timestamp (age + jiffies) when recording config information. The old code incorrectly used the time elapsed on the ageing timer which was incorrect. See also: https://bugzilla.vyatta.com/show_bug.cgi?id=7164 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Merge commit 'v3.0' into android-3.0Colin Cross2011-08-1018-75/+168
|\ \ | |/
| * Merge branch 'for-linus' of ↵Linus Torvalds2011-07-191-7/+10
| |\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: fix file mode calculation
| | * ceph: fix file mode calculationSage Weil2011-07-191-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open(2) must always include one of O_RDONLY, O_WRONLY, or O_RDWR. No need for any O_APPEND special case. Passing O_WRONLY|O_RDWR is undefined according to the man page, but the Linux VFS interprets this as O_RDWR, so we'll do the same. This fixes open(2) with flags O_RDWR|O_APPEND, which was incorrectly being translated to readonly. Reported-by: Fyodor Ustinov <ufm@ufm.su> Signed-off-by: Sage Weil <sage@newdream.net>
| * | Bluetooth: Fix crash with incoming L2CAP connectionsIlia Kolomisnky2011-07-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another regression fix considering incomming l2cap connections with defer_setup enabled. In situations when incomming connection is extracted with l2cap_sock_accept, it's bt_sock info will have 'parent' member zerroed, but 'parent' may be used unconditionally in l2cap_conn_start() and l2cap_security_cfm() when defer_setup is enabled. Backtrace: [<bf02d5ac>] (l2cap_security_cfm+0x0/0x2ac [bluetooth]) from [<bf01f01c>] (hci_event_pac ket+0xc2c/0x4aa4 [bluetooth]) [<bf01e3f0>] (hci_event_packet+0x0/0x4aa4 [bluetooth]) from [<bf01a844>] (hci_rx_task+0x cc/0x27c [bluetooth]) [<bf01a778>] (hci_rx_task+0x0/0x27c [bluetooth]) from [<c008eee4>] (tasklet_action+0xa0/ 0x15c) [<c008ee44>] (tasklet_action+0x0/0x15c) from [<c008f38c>] (__do_softirq+0x98/0x130) r7:00000101 r6:00000018 r5:00000001 r4:efc46000 [<c008f2f4>] (__do_softirq+0x0/0x130) from [<c008f524>] (do_softirq+0x4c/0x58) [<c008f4d8>] (do_softirq+0x0/0x58) from [<c008f5e0>] (run_ksoftirqd+0xb0/0x1b4) r4:efc46000 r3:00000001 [<c008f530>] (run_ksoftirqd+0x0/0x1b4) from [<c009f2a8>] (kthread+0x84/0x8c) r7:00000000 r6:c008f530 r5:efc47fc4 r4:efc41f08 [<c009f224>] (kthread+0x0/0x8c) from [<c008cc84>] (do_exit+0x0/0x5f0) Signed-off-by: Ilia Kolomisnky <iliak@ti.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.1 at 2025-01-15 07:51:17 +0000