JP Abgrall
97a4ac881a
nf: xt_qtaguid: fix handling for cases where tunnels are used.
...
* fix skb->dev vs par->in/out
When there is some forwarding going on, it introduces extra state
around devs associated with xt_action_param->in/out and sk_buff->dev.
E.g.
par->in and par->out are both set, or
skb->dev and par->out are both set (and different)
This would lead qtaguid to make the wrong assumption about the
direction and update the wrong device stats.
Now we rely more on par->in/out.
* Fix handling when qtaguid is used as "owner"
When qtaguid is used as an owner module, and sk_socket->file is
not there (happens when tunnels are involved), it would
incorrectly do a tag stats update.
* Correct debug messages.
Bug: 11687690
Change-Id: I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f
CRs-Fixed: 747810
Signed-off-by: JP Abgrall <jpa@google.com>
Git-commit: 2b71479d6f5fe8f33b335f713380f72037244395
Git-repo: https://www.codeaurora.org/cgit/quic/la/kernel/mediatek
[imaund@codeaurora.org: Resolved trivial context conflicts.]
Signed-off-by: Ian Maund <imaund@codeaurora.org>
[bflowers@codeaurora.org: Resolved merge conflicts]
Signed-off-by: Bryse Flowers <bflowers@codeaurora.org>
2016-08-29 13:59:18 -07:00
Linux Build Service Account
aaf356abef
Merge "scsi: ufs: add 2 lane support"
2016-08-29 06:46:44 -07:00
Linux Build Service Account
436eeda4f1
Merge "drivers: mfd: Add 1.6MHz clk support for wcd934x codec"
2016-08-29 00:49:28 -07:00
Linux Build Service Account
37d7004cec
Merge "defconfig: msm64: msm: Compile vidc driver as LKM"
2016-08-29 00:49:28 -07:00
Linux Build Service Account
1de43aecd2
Merge "sound: usb: Add NULL check on return value of iommu_domain_alloc()"
2016-08-29 00:49:27 -07:00
Linux Build Service Account
627ff531cb
Merge "input: synaptics_dsx_2.6: correct sysfs permissions"
2016-08-29 00:49:26 -07:00
Linux Build Service Account
2b4e8cbd34
Merge "Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4""
2016-08-29 00:49:25 -07:00
Linux Build Service Account
50618ab44f
Merge "usb: gadget: f_cdev: Handle notification request properly"
2016-08-29 00:49:25 -07:00
Linux Build Service Account
7121dd22c2
Merge "msm_vidc: venc: configure max-B-frames only if B is enabled"
2016-08-29 00:49:23 -07:00
Linux Build Service Account
105d1fddef
Merge "mm: zbud: fix the locking scenarios with zcache"
2016-08-29 00:49:23 -07:00
Linux Build Service Account
cbbeefbea9
Merge "clk: qcom: Add support for clk_set_flags for branch and dummy clock"
2016-08-29 00:49:21 -07:00
Linux Build Service Account
5eaa42dc62
Merge "radio: iris: uapi header split"
2016-08-29 00:49:21 -07:00
Venkat Gopalakrishnan
b938e3480e
scsi: ufs: add 2 lane support
...
Qcom ufs controller v3.1.0 supports 2 lanes, add support
to configure 2 lanes during phy initialization.
Change-Id: Ifa2bac71b47ce49a6fb31ebb8dd54b243e1cfae1
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2016-08-29 00:16:13 -07:00
Subhash Jadavani
19bec73759
phy: qcom-ufs-qmp-v3: add 2 lane phy support
...
New version of phy-qcom-ufs-qmp-v3 supports 2 lanes,
this change adds the config table to enable 2 lanes.
Change-Id: Ie916e7090d3660711159b886c27ee3709891ef2b
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2016-08-29 00:15:41 -07:00
Linux Build Service Account
e8a0e0808d
Merge "ASoC: wcd934x: Add DSD volume support"
2016-08-27 03:35:38 -07:00
Linux Build Service Account
9a3bdf21ff
Merge "ARM: dts: msm: Update power attributes for msmcobalt"
2016-08-27 03:35:37 -07:00
Linux Build Service Account
1adaeeae92
Merge "msm: vidc: Fix multistream issues"
2016-08-27 03:35:36 -07:00
Linux Build Service Account
78cf186b80
Merge "qpnp-fg-gen3: export the battery float voltage"
2016-08-26 22:23:00 -07:00
Linux Build Service Account
97cb0bb99f
Merge "qcom-charger: smb-lib: correct the usb suspend votable name"
2016-08-26 22:23:00 -07:00
Linux Build Service Account
8dff1db3bc
Merge "qcom-charger: qpnp-fg-gen3: add v2 SRAM register map"
2016-08-26 22:22:59 -07:00
Linux Build Service Account
2507985cbc
Merge "ARM: dts: msm: Update GPU SMMU settings for cobalt"
2016-08-26 22:22:58 -07:00
Linux Build Service Account
844331baa5
Merge "host: sdhci: fix current caps when there is no host->vmmc"
2016-08-26 22:22:58 -07:00
Linux Build Service Account
9c34e4b38d
Merge "ARM: dts: msmcobalt: add status property for memlat-mon for msmcobalt"
2016-08-26 22:22:57 -07:00
Linux Build Service Account
fad851b94a
Merge "cnss: Provide API to CLD Driver to control SPDT GPIO"
2016-08-26 22:22:54 -07:00
Linux Build Service Account
9a7c65cabe
Merge "input: synaptics_dsx_2.6: fix issues raised by static analyzer"
2016-08-26 22:22:50 -07:00
Linux Build Service Account
f6b34d14bd
Merge "clk: msm: gcc-cobalt: Remove support for wcss clocks"
2016-08-26 22:22:49 -07:00
Linux Build Service Account
98af233d95
Merge "defconfig: Enable support for destroying TCP sockets through diag"
2016-08-26 22:22:49 -07:00
Linux Build Service Account
9e59905b59
Merge "qcom-charger: smb138x: fix buck damage on v1.1 hardware"
2016-08-26 22:22:47 -07:00
Linux Build Service Account
12c49e3e08
Merge "msm: vidc: Use internal size for extradata plane"
2016-08-26 22:22:47 -07:00
Linux Build Service Account
10e99580c4
Merge "ARM: dts: msm: Add initial support for msmcobalt QRD SKUK board"
2016-08-26 22:22:46 -07:00
Linux Build Service Account
fcb4d9dd29
Merge "sched: Make use of sysctl_sched_wake_to_idle in select_best_cpu"
2016-08-26 22:22:38 -07:00
Linux Build Service Account
1b7819036e
Merge "sched: handle frequency alert notifications better"
2016-08-26 22:22:38 -07:00
Linux Build Service Account
373c6ba99f
Merge "regulator: cpr3: fix panic callback failure in interrupt context"
2016-08-26 22:22:37 -07:00
Linux Build Service Account
7275a2b7bb
Merge "misc: qcom: qdsp6v2: initialize wma_config_32"
2016-08-26 22:22:36 -07:00
Linux Build Service Account
c41f5ad099
Merge "usb: hcd: Add USB atomic notifier callback for HC died error"
2016-08-26 22:22:35 -07:00
Linux Build Service Account
c3b0ac1e39
Merge "msm: mdss: dsi: fix the check for PLL off when turning off PHY"
2016-08-26 22:22:34 -07:00
Linux Build Service Account
40823f5463
Merge "ARM: dts: Change minimum voltage for LDO25"
2016-08-26 22:22:32 -07:00
Linux Build Service Account
735670e06b
Merge "ARM: dts: msm: update DSI phy strength settings for msmcobalt"
2016-08-26 22:22:31 -07:00
Linux Build Service Account
86e05456b9
Merge "msm: mdss: dsi: update DSI phy v3 initialization sequence"
2016-08-26 22:22:28 -07:00
Linux Build Service Account
1c416b0f74
Merge "input: ft5x06_ts: add proximity feature support"
2016-08-26 22:22:20 -07:00
Linux Build Service Account
02592fae06
Merge "msm: mdss: hide kernel addresses from unprevileged users"
2016-08-26 22:22:19 -07:00
Linux Build Service Account
d1a36be393
Merge "ARM: dts: msm: configure CX voltage levels from MDSS for msmcobalt"
2016-08-26 22:22:18 -07:00
Linux Build Service Account
9982c0b83f
Merge "msm: ipa3: Adapt version handling to support IPAv3.5/3.5.1"
2016-08-26 22:22:17 -07:00
Hemant Kumar
6237ba1562
usb: gadget: f_cdev: Handle notification request properly
...
Driver is setting notify request pointer to NULL in order
to prevent re-queueing of notification request until it is
completed. This results into NULL ptr dereference if ioctl
happens before driver unbind tries to free the request buffer.
Fix this issue by introduce a flag q_again to prevent re-queuing
of same request instead of setting notify request pointer to NULL.
Also add NULL check in usb_cser_free_req() and set the request
pointer to NULL after freeing it.
Change-Id: Id431f911d3bdebfeedd0a5c1e36218ce7467ba67
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
2016-08-26 18:37:56 -07:00
Linux Build Service Account
f29483dcef
Merge "phy: qcom-ufs: update ufs phy settings"
2016-08-26 14:48:53 -07:00
Linux Build Service Account
1517f23dfd
Merge "soc: qcom: rpm-smd: Account for NOACK messages with system sleep"
2016-08-26 14:48:53 -07:00
Linux Build Service Account
8e8c0536ff
Merge "soc: qcom: glink: Best Fit approach to find intent"
2016-08-26 14:48:52 -07:00
Linux Build Service Account
d319bf625a
Merge "qcom_charger: smb-lib: support faking battery capacity"
2016-08-26 14:48:51 -07:00
Linux Build Service Account
67f8c022ca
Merge "msm: ipa: WA to get PA of sgt_tbl from wlan"
2016-08-26 14:48:50 -07:00
Linux Build Service Account
b4c3d95c1f
Merge "msm: ipa3: remove wrong smmu clk vote"
2016-08-26 14:48:50 -07:00