aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
Commit message (Collapse)AuthorAgeFilesLines
* wcnss: Avoid user buffer overloading for write cal dataAriel Yin2016-08-161-1/+1
| | | | | | | | | | compare size of allocated cal data buffer from heap and count bytes provided to write by user to avoid heap overflow for write cal data. Change-Id: Id70c3230f761385489e5e94c613f4519239dfb1f CRs-Fixed: 1032174 Signed-off-by: Anand Kumar <anandkumar@codeaurora.org>
* UPSTREAM: cdc_ncm: do not call usbnet_link_change from cdc_ncm_bindBjørn Mork2016-07-181-15/+5
| | | | | | | | | | | | | | | | | | | | (cherry pick from commit 4d06dd537f95683aba3651098ae288b7cbff8274) usbnet_link_change will call schedule_work and should be avoided if bind is failing. Otherwise we will end up with scheduled work referring to a netdev which has gone away. Instead of making the call conditional, we can just defer it to usbnet_probe, using the driver_info flag made for this purpose. Fixes: 8a34b0ae8778 ("usbnet: cdc_ncm: apply usbnet_link_change") Reported-by: Andrey Konovalov <andreyknvl@gmail.com> Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: David S. Miller <davem@davemloft.net> Change-Id: Id9a6d02bdd98bf495d26595cf2cc90e480746186 Bug: 28744625
* UPSTREAM: ppp: take reference on channels netnsGuillaume Nault2016-07-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let channels hold a reference on their network namespace. Some channel types, like ppp_async and ppp_synctty, can have their userspace controller running in a different namespace. Therefore they can't rely on them to preclude their netns from being removed from under them. ================================================================== BUG: KASAN: use-after-free in ppp_unregister_channel+0x372/0x3a0 at addr ffff880064e217e0 Read of size 8 by task syz-executor/11581 ============================================================================= BUG net_namespace (Not tainted): kasan: bad access detected ----------------------------------------------------------------------------- Disabling lock debugging due to kernel taint INFO: Allocated in copy_net_ns+0x6b/0x1a0 age=92569 cpu=3 pid=6906 [< none >] ___slab_alloc+0x4c7/0x500 kernel/mm/slub.c:2440 [< none >] __slab_alloc+0x4c/0x90 kernel/mm/slub.c:2469 [< inline >] slab_alloc_node kernel/mm/slub.c:2532 [< inline >] slab_alloc kernel/mm/slub.c:2574 [< none >] kmem_cache_alloc+0x23a/0x2b0 kernel/mm/slub.c:2579 [< inline >] kmem_cache_zalloc kernel/include/linux/slab.h:597 [< inline >] net_alloc kernel/net/core/net_namespace.c:325 [< none >] copy_net_ns+0x6b/0x1a0 kernel/net/core/net_namespace.c:360 [< none >] create_new_namespaces+0x2f6/0x610 kernel/kernel/nsproxy.c:95 [< none >] copy_namespaces+0x297/0x320 kernel/kernel/nsproxy.c:150 [< none >] copy_process.part.35+0x1bf4/0x5760 kernel/kernel/fork.c:1451 [< inline >] copy_process kernel/kernel/fork.c:1274 [< none >] _do_fork+0x1bc/0xcb0 kernel/kernel/fork.c:1723 [< inline >] SYSC_clone kernel/kernel/fork.c:1832 [< none >] SyS_clone+0x37/0x50 kernel/kernel/fork.c:1826 [< none >] entry_SYSCALL_64_fastpath+0x16/0x7a kernel/arch/x86/entry/entry_64.S:185 INFO: Freed in net_drop_ns+0x67/0x80 age=575 cpu=2 pid=2631 [< none >] __slab_free+0x1fc/0x320 kernel/mm/slub.c:2650 [< inline >] slab_free kernel/mm/slub.c:2805 [< none >] kmem_cache_free+0x2a0/0x330 kernel/mm/slub.c:2814 [< inline >] net_free kernel/net/core/net_namespace.c:341 [< none >] net_drop_ns+0x67/0x80 kernel/net/core/net_namespace.c:348 [< none >] cleanup_net+0x4e5/0x600 kernel/net/core/net_namespace.c:448 [< none >] process_one_work+0x794/0x1440 kernel/kernel/workqueue.c:2036 [< none >] worker_thread+0xdb/0xfc0 kernel/kernel/workqueue.c:2170 [< none >] kthread+0x23f/0x2d0 kernel/drivers/block/aoe/aoecmd.c:1303 [< none >] ret_from_fork+0x3f/0x70 kernel/arch/x86/entry/entry_64.S:468 INFO: Slab 0xffffea0001938800 objects=3 used=0 fp=0xffff880064e20000 flags=0x5fffc0000004080 INFO: Object 0xffff880064e20000 @offset=0 fp=0xffff880064e24200 CPU: 1 PID: 11581 Comm: syz-executor Tainted: G B 4.4.0+ Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.8.2-0-g33fbe13 by qemu-project.org 04/01/2014 00000000ffffffff ffff8800662c7790 ffffffff8292049d ffff88003e36a300 ffff880064e20000 ffff880064e20000 ffff8800662c77c0 ffffffff816f2054 ffff88003e36a300 ffffea0001938800 ffff880064e20000 0000000000000000 Call Trace: [< inline >] __dump_stack kernel/lib/dump_stack.c:15 [<ffffffff8292049d>] dump_stack+0x6f/0xa2 kernel/lib/dump_stack.c:50 [<ffffffff816f2054>] print_trailer+0xf4/0x150 kernel/mm/slub.c:654 [<ffffffff816f875f>] object_err+0x2f/0x40 kernel/mm/slub.c:661 [< inline >] print_address_description kernel/mm/kasan/report.c:138 [<ffffffff816fb0c5>] kasan_report_error+0x215/0x530 kernel/mm/kasan/report.c:236 [< inline >] kasan_report kernel/mm/kasan/report.c:259 [<ffffffff816fb4de>] __asan_report_load8_noabort+0x3e/0x40 kernel/mm/kasan/report.c:280 [< inline >] ? ppp_pernet kernel/include/linux/compiler.h:218 [<ffffffff83ad71b2>] ? ppp_unregister_channel+0x372/0x3a0 kernel/drivers/net/ppp/ppp_generic.c:2392 [< inline >] ppp_pernet kernel/include/linux/compiler.h:218 [<ffffffff83ad71b2>] ppp_unregister_channel+0x372/0x3a0 kernel/drivers/net/ppp/ppp_generic.c:2392 [< inline >] ? ppp_pernet kernel/drivers/net/ppp/ppp_generic.c:293 [<ffffffff83ad6f26>] ? ppp_unregister_channel+0xe6/0x3a0 kernel/drivers/net/ppp/ppp_generic.c:2392 [<ffffffff83ae18f3>] ppp_asynctty_close+0xa3/0x130 kernel/drivers/net/ppp/ppp_async.c:241 [<ffffffff83ae1850>] ? async_lcp_peek+0x5b0/0x5b0 kernel/drivers/net/ppp/ppp_async.c:1000 [<ffffffff82c33239>] tty_ldisc_close.isra.1+0x99/0xe0 kernel/drivers/tty/tty_ldisc.c:478 [<ffffffff82c332c0>] tty_ldisc_kill+0x40/0x170 kernel/drivers/tty/tty_ldisc.c:744 [<ffffffff82c34943>] tty_ldisc_release+0x1b3/0x260 kernel/drivers/tty/tty_ldisc.c:772 [<ffffffff82c1ef21>] tty_release+0xac1/0x13e0 kernel/drivers/tty/tty_io.c:1901 [<ffffffff82c1e460>] ? release_tty+0x320/0x320 kernel/drivers/tty/tty_io.c:1688 [<ffffffff8174de36>] __fput+0x236/0x780 kernel/fs/file_table.c:208 [<ffffffff8174e405>] ____fput+0x15/0x20 kernel/fs/file_table.c:244 [<ffffffff813595ab>] task_work_run+0x16b/0x200 kernel/kernel/task_work.c:115 [< inline >] exit_task_work kernel/include/linux/task_work.h:21 [<ffffffff81307105>] do_exit+0x8b5/0x2c60 kernel/kernel/exit.c:750 [<ffffffff813fdd20>] ? debug_check_no_locks_freed+0x290/0x290 kernel/kernel/locking/lockdep.c:4123 [<ffffffff81306850>] ? mm_update_next_owner+0x6f0/0x6f0 kernel/kernel/exit.c:357 [<ffffffff813215e6>] ? __dequeue_signal+0x136/0x470 kernel/kernel/signal.c:550 [<ffffffff8132067b>] ? recalc_sigpending_tsk+0x13b/0x180 kernel/kernel/signal.c:145 [<ffffffff81309628>] do_group_exit+0x108/0x330 kernel/kernel/exit.c:880 [<ffffffff8132b9d4>] get_signal+0x5e4/0x14f0 kernel/kernel/signal.c:2307 [< inline >] ? kretprobe_table_lock kernel/kernel/kprobes.c:1113 [<ffffffff8151d355>] ? kprobe_flush_task+0xb5/0x450 kernel/kernel/kprobes.c:1158 [<ffffffff8115f7d3>] do_signal+0x83/0x1c90 kernel/arch/x86/kernel/signal.c:712 [<ffffffff8151d2a0>] ? recycle_rp_inst+0x310/0x310 kernel/include/linux/list.h:655 [<ffffffff8115f750>] ? setup_sigcontext+0x780/0x780 kernel/arch/x86/kernel/signal.c:165 [<ffffffff81380864>] ? finish_task_switch+0x424/0x5f0 kernel/kernel/sched/core.c:2692 [< inline >] ? finish_lock_switch kernel/kernel/sched/sched.h:1099 [<ffffffff81380560>] ? finish_task_switch+0x120/0x5f0 kernel/kernel/sched/core.c:2678 [< inline >] ? context_switch kernel/kernel/sched/core.c:2807 [<ffffffff85d794e9>] ? __schedule+0x919/0x1bd0 kernel/kernel/sched/core.c:3283 [<ffffffff81003901>] exit_to_usermode_loop+0xf1/0x1a0 kernel/arch/x86/entry/common.c:247 [< inline >] prepare_exit_to_usermode kernel/arch/x86/entry/common.c:282 [<ffffffff810062ef>] syscall_return_slowpath+0x19f/0x210 kernel/arch/x86/entry/common.c:344 [<ffffffff85d88022>] int_ret_from_sys_call+0x25/0x9f kernel/arch/x86/entry/entry_64.S:281 Memory state around the buggy address: ffff880064e21680: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff880064e21700: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb >ffff880064e21780: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff880064e21800: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff880064e21880: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== Bug:28979703 Fixes: 273ec51dd7ce ("net: ppp_generic - introduce net-namespace functionality v2") Reported-by: Baozeng Ding <sploving1@gmail.com> Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit 1f461dcdd296eecedaffffc6bae2bfa90bd7eb89) Change-Id: Ib5a54fc1814b96ce6ebefcc6f63dfa92880503c0
* UPSTREAM: usbnet: cleanup after bind() in probe()Oliver Neukum2016-06-201-0/+7
| | | | | | | | | | | | | | | | | | Bug: 28744625 In case bind() works, but a later error forces bailing in probe() in error cases work and a timer may be scheduled. They must be killed. This fixes an error case related to the double free reported in http://www.spinics.net/lists/netdev/msg367669.html and needs to go on top of Linus' fix to cdc-ncm. (cherry picked from commit 1666984c8625b3db19a9abc298931d35ab7bc64b) Change-Id: Idc0313b666a1c149991d315da5529300f405585f Signed-off-by: Oliver Neukum <ONeukum@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Yueyao (Nathan) Zhu <yueyao@google.com>
* wcnss: Avoid writing zero to PMU config registerHardik Kantilal Patel2015-02-151-1/+0
| | | | | | | | | Avoid writing zero to PMU config register while taking MUX control. Change-Id: Ib05cd43a8d3bc4df27e27fef9e1539834d72e77a CRs-Fixed: 794268 Signed-off-by: Hardik Kantilal Patel <hkpatel@codeaurora.org>
* wcnss: add NULL check before accessing pnv pointerAnand N Sunkad2015-02-081-7/+10
| | | | | | | | | Direct accessing of pnv pointer leads for NULL dereference. To mitigate issue add NULL check before useing a pnv pointer. Change-Id: I99f96db6a715ad17414572a47ecda1fd55ecceb8 CRs-Fixed: 790447 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* wcnss: avoid removing pm_qos request when already removedSiddharth Bhal2015-01-291-1/+7
| | | | | | | | | | | | Race condition is observed when removing pm_qos request to avoid power collapse of BIMC. Using Mutex lock to ensure proper synchronization in removing pm_qos request and not remove request when already removed. CRs-Fixed: 766358 Change-Id: I8976fec9d6f145e213a827894bb58aee23155971 Signed-off-by: Siddharth Bhal <sbhal@codeaurora.org>
* wcnss: add proper macro value check to avoid unnecessary delayAnand N Sunkad2015-01-201-1/+2
| | | | | | | | | | | | wcnss_service is sends value zero to platform driver, to indicate cal data is not present, but platform driver checking received value with macro value -1, because of improper macro value check unnecessary delay is added. To mitigate issue add proper macro value check and avoid the unnecessary delay. Change-Id: I8ff55c7e95c8b556063928d22940a16bee60e931 CRs-Fixed: 779421 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* wcnss: get MUX control before dumping IRIS registerAnand N Sunkad2015-01-132-4/+17
| | | | | | | | | | Sometimes dumping IRIS register along with PRONTO register results in crash. To mitigate issue get MUX control before dumping IRIS register. Change-Id: Ie1e19a254ec1ae43c2713c86c4d35a2d9968bcd6 CRs-Fixed: 777663 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* wcnss: logging enhancement with IRIS register dump at Wdog biteAnand N Sunkad2015-01-131-4/+8
| | | | | | | | | | Dump IRIS register during Wdog bite and sending FIQ to confirm if XO enable command was ever received or not. Add debug log when SMD msg header is unavialable completely. Change-Id: I0a6b2c4d3db5c12e340e08c4572bde91f94d0189 CRs-Fixed: 769672 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* wcnss: reset IRIS before reading IRIS revision registerAnand N Sunkad2014-12-171-37/+51
| | | | | | | | | Sometime reading IRIS chip id result in garbage value. To mitigate issue reset IRIS before reading IRIS chip id. Change-Id: I21068c6121ec3fe999c87a1fb3bf790954006afb CRs-Fixed: 766436 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* msm_rmnet_bam: Do not grab non-RMNET BAM channelsHarout Hedeshian2014-12-161-1/+1
| | | | | | | | Driver was previously grabbing all BAM channels instead of only the RmNet channels. Only RmNet Channels will be registered. Change-Id: Iba48c1a69dcabd6c26b488ec8c89dcd18d9a157f Signed-off-by: Harout Hedeshian <harouth@codeaurora.org>
* wcnss: vote for corners for vddmx for msm8909Siddharth Bhal2014-12-141-14/+32
| | | | | | | | Add support to vote for corners for vddmx for msm8909. Change-Id: I924262d3b9e1ed7c8dd76f806e32b66c63d3425a CRs-Fixed: 769080 Signed-off-by: Siddharth Bhal <sbhal@codeaurora.org>
* wcnss: configure IRIS clock to 19.2MhzAnand N Sunkad2014-12-111-2/+28
| | | | | | | | | Set IRIS clock to 19.2Mhz if there is no iris card found or detected IRIS card's chip id is invalid. Change-Id: Ib9063e67315faca0a3817c1c5df8655f57b9c381 CRs-fixed: 743022 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* Merge "cnss: Dynamically allocate ramdump memory"Linux Build Service Account2014-10-261-30/+114
|\
| * cnss: Dynamically allocate ramdump memoryPrashanth Bhatta2014-10-221-30/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | Existing solution to reserve the memory region for CNSS ramdump collection has it's own limitations because of reserving the memory region for each platforms even before CNSS driver is probed. Add implementation to allocate the required memory for CNSS ramdump using dma_alloc_coherent API and update the physical address in dump table so that tools can find the starting address of the CNSS ramdump in the crash dump. Change-Id: I66a5abe098852115a11b0b4231d3692cf79da75c Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
* | Merge "msm: mhi: Resolve deadlock in iface down"Linux Build Service Account2014-10-241-48/+75
|\ \
| * | msm: mhi: Resolve deadlock in iface downAndrei Danaila2014-10-221-48/+75
| | | | | | | | | | | | | | | | | | | | | | | | Resolve issue whereby a deadblock is encountered when trying to put the interface down. Change-Id: I757492fceff56014b28ec50307f6d84b1bb81889 Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
* | | Merge "msm: mhi: Prevent IRQ mask race condition in MHI"Linux Build Service Account2014-10-241-6/+6
|\| |
| * | msm: mhi: Prevent IRQ mask race condition in MHIAndrei Danaila2014-10-211-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a race condition in MHI RmNet where the RX interrupt could remain masked forever. CRs-Fixed: 723355 Change-Id: I9606963b8b2d6d1cb125c0bc7be8610b06f67be3 Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
* | | Merge "msm: mhi: Fixed race condition in rmnet"Linux Build Service Account2014-10-241-15/+35
|\| |
| * | msm: mhi: Fixed race condition in rmnetAndrei Danaila2014-10-211-15/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition in MHI RmNet whereby the outbound MHI ring could be empty while the network stack believes it is full. This leads to a non recoverable data stall. Add rwlock to ensure checks for full and empty conditions are atomic. CRs-Fixed: 733646 Change-Id: If54baa4be762a976d64213d0ec52e969f2497036 Signed-off-by: Andrei Danaila <adanaila@codeaurora.org>
* | Merge "cnss: Add support for creating board data file image table"Linux Build Service Account2014-10-231-43/+121
|\ \ | |/ |/|
| * cnss: Add support for creating board data file image tableYuanyuan Liu2014-10-161-43/+121
| | | | | | | | | | | | | | | | | | | | | | Add support for creating board data file image table for module QCA6180. QCA6180 module requires the host to build the board data image descriptor table on host memory. And the target will fetch board data file once the BMI load command is received from host. CRs-Fixed: 738427 Change-Id: I3efa035ee2f125cc8009106b808f2dfc0e33ba97 Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
* | Merge "wcnss: select 19 MHz XO for 3610 Iris card"Linux Build Service Account2014-10-181-1/+5
|\ \ | |/ |/|
| * wcnss: select 19 MHz XO for 3610 Iris cardSiddharth Bhal2014-10-141-1/+5
| | | | | | | | | | | | | | | | | | Add support to select 19MHz crystal oscillator for 3610 Iris card. Change-Id: I4ba3d5b516bdfcaceba1463465606aa9ec1d6c0a CRs-Fixed: 738074 Signed-off-by: Siddharth Bhal <sbhal@codeaurora.org>
* | Merge "cnss: Sysfs support to test BMI Commands"Linux Build Service Account2014-10-141-2/+21
|\ \
| * | cnss: Sysfs support to test BMI CommandsKomal Seelam2014-10-141-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCA6180 supports various BMI commands which are not needed for the wlan BMI Phase. To verify all the BMI Commands add support to test them on need. Test: echo 0x09 to fw_image_setup to enable bmi testing. Commands: BMI_NO_COMMAND, BMI_WRITE_MEMORY, BMI_READ_MEMORY, BMI_EXECUTE, BMI_GET_TARGET_INFO, BMI_DONE Change-Id: Ifa2ba0d53b0123e69b3d683c68cd0c773be26353 Signed-off-by: Komal Seelam <kseelam@codeaurora.org>
* | | Merge "wcnss: add condition to check for pronto ver3 hardware"Linux Build Service Account2014-10-141-0/+13
|\ \ \
| * | | wcnss: add condition to check for pronto ver3 hardwareSiddharth Bhal2014-10-131-0/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Add support to check for pronto ver3 hardware is present by reading a device tree entry Change-Id: I01cd71ac6c00b6c1e4c5ea46b3f3c0b57a0dbd95 CRs-Fixed: 737209 Signed-off-by: Siddharth Bhal <sbhal@codeaurora.org>
* | | Merge "cnss: Add Support to load driver based on target attached"Linux Build Service Account2014-10-141-0/+25
|\ \ \
| * | | cnss: Add Support to load driver based on target attachedKomal Seelam2014-10-111-0/+25
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Next Generation platforms; we support driver load at the bootup based on the target attached. Platform Driver(PD) exports the target revision read in pcie probe to userspace through sys interface wlan_setup. cnss-daemon in user space loads the driver based on the target revision read from the sys file. This change creates the sys interface to export the target parameters. CRs-Fixed: 732694 Change-Id: Ia364f9c5df6116b9ca6ed28f545c3f0dd244386b Signed-off-by: Komal Kumar <kseelam@codeaurora.org>
* | | Merge "wcnss: handle CBC complete event from firmware"Linux Build Service Account2014-10-141-0/+16
|\ \ \ | |_|/ |/| |
| * | wcnss: handle CBC complete event from firmwareAnand N Sunkad2014-10-121-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add case to handle cold boot calibration complete event from firmware. Change-Id: I3d3dce178fadd7f993ee31667c89bcebb02c388b CRs-Fixed: 734932 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* | | Merge "msm: ecm_ipa: add ethernet bridging support"Linux Build Service Account2014-10-121-0/+6
|\ \ \
| * | | msm: ecm_ipa: add ethernet bridging supportRavit Katzav2014-10-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide header type information to IPA driver for Ethernet Bridging. Change-Id: I699f63fd2a009b1ab015c4a961bc17e6a36d2f2b Acked-by: Ady Abraham <adya@qti.qualcomm.com> Signed-off-by: Ravit Katzav <rkatzav@codeaurora.org>
* | | | Merge "msm: rndis_ipa: add ethernet bridging support"Linux Build Service Account2014-10-121-0/+5
|\| | |
| * | | msm: rndis_ipa: add ethernet bridging supportRavit Katzav2014-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide header type information to IPA driver for Ethernet Bridging. Change-Id: I6c61dcafed8f459718de91c978f3cc4ffa09b5cc Acked-by: Ady Abraham <adya@qti.qualcomm.com> Signed-off-by: Ravit Katzav <rkatzav@codeaurora.org>
* | | | Merge "msm: rndis_ipa: expand skb if no room"Linux Build Service Account2014-10-121-3/+18
|\ \ \ \
| * | | | msm: rndis_ipa: expand skb if no roomRavit Katzav2014-10-081-3/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case there if no headroom for RNDIS header, expand the skb before adding the RNDIS header. Change-Id: Ib0945004408ea1847a92f64a49b89e895ddcbf5c Acked-by: Ady Abraham <adya@qti.qualcomm.com> Signed-off-by: Ravit Katzav <rkatzav@codeaurora.org>
* | | | Merge "wcnss: dump CCU bridge error registers for pronto"Linux Build Service Account2014-10-121-0/+21
|\ \ \ \
| * | | | wcnss: dump CCU bridge error registers for prontoAnand N Sunkad2014-10-091-0/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump CCU bridge error registers in case of wcnss abort. Change-Id: Idc23da043e215a6ba687977cf2c72d42c276d228 CRs-Fixed: 735607 Signed-off-by: Anand N Sunkad <asunka@codeaurora.org>
* | | | Merge "cnss: Add FW files support for Rome 3.2"Linux Build Service Account2014-10-121-0/+2
|\ \ \ \
| * | | | cnss: Add FW files support for Rome 3.2Sameer Thalappil2014-10-101-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map Rome 3.2 FW files to Rome 3.0 files. CRs-Fixed: 736975 Change-Id: I65e1fa42dcdefe66a92eb1d690f6910bd09899cb Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
* | | | Merge "cnss: Fix spelling and downgrade error level"Linux Build Service Account2014-10-111-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | cnss: Fix spelling and downgrade error levelSameer Thalappil2014-10-011-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling in error message; also downgrade the error level. Swappable partition is an optional feature, not finding the image is not an error. CRs-Fixed: 732663 Change-Id: If3c15d6ae1984d75db6ca7e64766eff3198e8bbe Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
* | | cnss: Add support for QCA6180Sameer Thalappil2014-10-081-4/+351
| |/ |/| | | | | | | | | | | | | | | | | | | Add support for QCA6180 module. QCA6180 module requires the host to build the FW image descriptor table on host memory. And the target will fetch these FW images once the BMI load command is received from host. CRs-Fixed: 732760 Change-Id: I53920c1c3881c1119fead684bbafae20e2470f1c Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
* | Merge changes I56d9097a,I0db7259e,Ide5960ea,Ib11bd43c,I2b443e6d into msm-3.10Linux Build Service Account2014-10-041-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: defconfig: fsm9900: Add GSM NL HW support ARM: dts: msm: Enable the UART1 entry in fsm9900 MTP defconfig: fsm9900: Enable PPPOE kernel option msm: emac: Report time delta of next PTP pulse in sysfs platform: msm: uim: fix return value of write operation
| * | msm: emac: Report time delta of next PTP pulse in sysfsGilad Avidov2014-10-031-3/+3
| |/ | | | | | | | | | | | | | | | | | | Change the reporting format of sysfs node to show the next EMAC PTP pulse to avoid confusion. The combination of the third and forth field shows the time delta until the next pulse. Change-Id: Ib11bd43c38bf5423b4ca68c917a7a244d3cee3ae Acked-by: Jie Luo <jluo@qti.qualcomm.com> Signed-off-by: Gilad Avidov <gavidov@codeaurora.org>
* | Merge "msm: rndis_ipa: set packet limit to 1 for downlink aggregation"Linux Build Service Account2014-10-031-3/+26
|\ \