aboutsummaryrefslogtreecommitdiff
path: root/include/uapi/linux
Commit message (Collapse)AuthorAgeFilesLines
* net: ipv6: autoconf routes into per-device tablesLorenzo Colitti2014-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, IPv6 router discovery always puts routes into RT6_TABLE_MAIN. This causes problems for connection managers that want to support multiple simultaneous network connections and want control over which one is used by default (e.g., wifi and wired). To work around this connection managers typically take the routes they prefer and copy them to static routes with low metrics in the main table. This puts the burden on the connection manager to watch netlink to see if the routes have changed, delete the routes when their lifetime expires, etc. Instead, this patch adds a per-interface sysctl to have the kernel put autoconf routes into different tables. This allows each interface to have its own autoconf table, and choosing the default interface (or using different interfaces at the same time for different types of traffic) can be done using appropriate ip rules. The sysctl behaves as follows: - = 0: default. Put routes into RT6_TABLE_MAIN as before. - > 0: manual. Put routes into the specified table. - < 0: automatic. Add the absolute value of the sysctl to the device's ifindex, and use that table. The automatic mode is most useful in conjunction with net.ipv6.conf.default.accept_ra_rt_table. A connection manager or distribution could set it to, say, -100 on boot, and thereafter just use IP rules. Change-Id: I82d16e3737d9cdfa6489e649e247894d0d60cbb1 Signed-off-by: Lorenzo Colitti <lorenzo@google.com> (cherry picked from commit a03f539b1636dd97e7f4f78da08b5e2e02e6cb6d) Reviewed-on: http://git-master/r/558593 GVS: Gerrit_Virtual_Submit Reviewed-by: Harshavardhan Nalajala <hnalajala@nvidia.com> Tested-by: Harshavardhan Nalajala <hnalajala@nvidia.com> Reviewed-by: Dhiren Parmar <dparmar@nvidia.com>
* usb: gadget: f_fs: support superspeed gadgetsJC Kuo2014-09-161-0/+10
| | | | | | | | | | | | | | This commit add superspeed gadgets support to f_fs gadget. Change-Id: I16a540098cfcd157e25b0e81d7cf2533ced2ae39 Signed-off-by: JC Kuo <jckuo@nvidia.com> Reviewed-on: http://git-master/r/436303 (cherry picked from commit 7b3de28db5d3a14838c8a31eb189bcb8e3fcc513) Reviewed-on: http://git-master/r/499235 GVS: Gerrit_Virtual_Submit Reviewed-by: Robert Shih <rshih@nvidia.com> Tested-by: Robert Shih <rshih@nvidia.com> Reviewed-by: Todd Poynter <tpoynter@nvidia.com>
* usb: gadget: mtp: add new ioctl for compatRohith Seelaboyina2014-03-251-1/+11
| | | | | | | | | | | | | | | | | Define a new ioctl for MTP_SEND_EVENT, as its ioctl numbers depends on the size of struct mtp_event, which varies in ARCH32 and ARCH64. Bug 1466403 Change-Id: I1d172aae422ca483b00c6dd59e739166f40c53ce Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com> Reviewed-on: http://git-master/r/377800 (cherry picked from commit c4367afe1d2bc3eca18ba8b83001869351fd30f1) Reviewed-on: http://git-master/r/385956 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
* audit: change decimal constant to macro for invalid uidRichard Guy Briggs2014-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | SFR reported this 2013-05-15: > After merging the final tree, today's linux-next build (i386 defconfig) > produced this warning: > > kernel/auditfilter.c: In function 'audit_data_to_entry': > kernel/auditfilter.c:426:3: warning: this decimal constant is unsigned only > in ISO C90 [enabled by default] > > Introduced by commit 780a7654cee8 ("audit: Make testing for a valid > loginuid explicit") from Linus' tree. Replace this decimal constant in the code with a macro to make it more readable (add to the unsigned cast to quiet the warning). Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com> (cherry picked from commit 42f74461a5b60cf6b42887e6d2ff5b7be4abf1ca) Change-Id: Ic6bf1f225cb8d8d9678b209a963bacfa8d9b0216 Signed-off-by: Philip Rakity <prakity@nvidia.com> Reviewed-on: http://git-master/r/361012 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* driver: mmc: Add new ioctl to send combo commandsSeshagiri Holi2014-01-061-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Add ioctl for sending a sequence of commands to the device, atomically. This combo command (MMC_COMBO_IOC_CMD) is a array of mmc_ioc_cmd. The user space application can send an array (mmc_ioc_cmd) of MMC commands. To ensure atomic operations of all commands in array, a single lock is acquired. This is required for user-space tools to issue refresh and check device's health and status. bug 1304972 Change-Id: I340b9a95e6471ee578e404a7b01eec3db02662d0 Reviewed-on: http://git-master/r/281699 (cherry picked from commit 8945e061c4c5b26bb17c6e2d7ab610a056e7011f) Reviewed-on: http://git-master/r/302096 Signed-off-by: Seshagiri Holi <sholi@nvidia.com> Reviewed-on: http://git-master/r/337181 Reviewed-by: Pavan Kunapuli <pkunapuli@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* Merge branch 'remotes/android/android-3.10' into dev-kernel-3.10Bharat Nihalani2013-12-306-0/+327
|\ | | | | | | Change-Id: I0c919e55654e0c224a5f8a5df80d9f49e92dbb37
| * net: move PPPoLAC and PPPoPNS headers to uapiColin Cross2013-11-072-0/+65
| | | | | | | | | | | | | | | | | | Move the entire contents of the linux/if_pppolac.h and linux/if_pppopns.h headers to uapi, they only contain userspace interfaces. Change-Id: I3cfed7f2ae400b53269a1f59144aa3dbc30ae0b5 Signed-off-by: Colin Cross <ccross@android.com>
| * usb: gadget: f_accessory: move userspace interface to uapiColin Cross2013-11-071-0/+146
| | | | | | | | | | | | | | | | Move the entire contents of linux/usb/f_accessory.h header to uapi, it only contains a userspace interface. Change-Id: Ieb5547da449588ae554988a201c0e6b4e3afc531 Signed-off-by: Colin Cross <ccross@android.com>
| * usb: gadget: f_mtp: move userspace interface to uapiColin Cross2013-11-071-0/+61
| | | | | | | | | | | | | | | | | | Move the most of linux/usb/f_mtp.h header to uapi. Move the only remaining structure definition into f_mtp.c, the only place that uses it. Change-Id: I952c1a9dc15c36bf295a0eb4d74b6b1ad912ed03 Signed-off-by: Colin Cross <ccross@android.com>
| * input: misc: keychord: move header to uapiColin Cross2013-11-071-0/+52
| | | | | | | | | | | | | | | | Move the entire contents of linux/keychord.h header to uapi, it only contains a userspace interface. Change-Id: If94f83328b19efb58c66391dce3bd8e927788d8d Signed-off-by: Colin Cross <ccross@android.com>
| * mm: add a field to store names for private anonymous memoryColin Cross2013-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Userspace processes often have multiple allocators that each do anonymous mmaps to get memory. When examining memory usage of individual processes or systems as a whole, it is useful to be able to break down the various heaps that were allocated by each layer and examine their size, RSS, and physical memory usage. This patch adds a user pointer to the shared union in vm_area_struct that points to a null terminated string inside the user process containing a name for the vma. vmas that point to the same address will be merged, but vmas that point to equivalent strings at different addresses will not be merged. Userspace can set the name for a region of memory by calling prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, start, len, (unsigned long)name); Setting the name to NULL clears it. The names of named anonymous vmas are shown in /proc/pid/maps as [anon:<name>] and in /proc/pid/smaps in a new "Name" field that is only present for named vmas. If the userspace pointer is no longer valid all or part of the name will be replaced with "<fault>". The idea to store a userspace pointer to reduce the complexity within mm (at the expense of the complexity of reading /proc/pid/mem) came from Dave Hansen. This results in no runtime overhead in the mm subsystem other than comparing the anon_name pointers when considering vma merging. The pointer is stored in a union with fieds that are only used on file-backed mappings, so it does not increase memory usage. Change-Id: Ie2ffc0967d4ffe7ee4c70781313c7b00cf7e3092 Signed-off-by: Colin Cross <ccross@android.com>
* | Merge tag 'v3.10.24' into HEADAjay Nandakumar2013-12-161-5/+7
|\ \ | | | | | | | | | | | | | | | This is the 3.10.24 stable release Change-Id: Ibd2734f93d44385ab86867272a1359158635133b
| * | perf: Fix perf ring buffer memory orderingPeter Zijlstra2013-11-201-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit bf378d341e4873ed928dc3c636252e6895a21f50 upstream. The PPC64 people noticed a missing memory barrier and crufty old comments in the perf ring buffer code. So update all the comments and add the missing barrier. When the architecture implements local_t using atomic_long_t there will be double barriers issued; but short of introducing more conditional barrier primitives this is the best we can do. Reported-by: Victor Kaplansky <victork@il.ibm.com> Tested-by: Victor Kaplansky <victork@il.ibm.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: michael@ellerman.id.au Cc: Paul McKenney <paulmck@linux.vnet.ibm.com> Cc: Michael Neuling <mikey@neuling.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: anton@samba.org Cc: benh@kernel.crashing.org Link: http://lkml.kernel.org/r/20131025173749.GG19466@laptop.lan Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Michael Neuling <mikey@neuling.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | media: tegra v4l2 camera: refactor driver codeBryan Wu2013-11-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconstruct the driver for Tegra V4L2 camera driver: - remove old driver file tegra_v4l2_camera.c - create driver file vi.c for VI/CSI (T20/T30/T114/T148) - create driver file vi2.c for VI2/CSI2 (T124) Bug 1377330 Change-Id: If030cf98e700b9201caa60328be822bc10610e74 Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/289329 GVS: Gerrit_Virtual_Submit Reviewed-by: Allen Martin <amartin@nvidia.com>
* | | Merge tag 'v3.10.12' into android-tegra-nv-3.10-rebaseDan Willemsen2013-09-142-1/+11
|\| | | | | | | | | | | | | | | | | This is the 3.10.12 stable release Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
| * | ICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTOJiri Bohac2013-09-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 61e76b178dbe7145e8d6afa84bb4ccea71918994 ] RFC 4443 has defined two additional codes for ICMPv6 type 1 (destination unreachable) messages: 5 - Source address failed ingress/egress policy 6 - Reject route to destination Now they are treated as protocol error and icmpv6_err_convert() converts them to EPROTO. RFC 4443 says: "Codes 5 and 6 are more informative subsets of code 1." Treat codes 5 and 6 as code 1 (EACCES) Btw, connect() returning -EPROTO confuses firefox, so that fallback to other/IPv4 addresses does not work: https://bugzilla.mozilla.org/show_bug.cgi?id=910773 Signed-off-by: Jiri Bohac <jbohac@suse.cz> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * | net_sched: restore "linklayer atm" handlingJesper Dangaard Brouer2013-09-141-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ Upstream commit 8a8e3d84b1719a56f9151909e80ea6ebc5b8e318 ] commit 56b765b79 ("htb: improved accuracy at high rates") broke the "linklayer atm" handling. tc class add ... htb rate X ceil Y linklayer atm The linklayer setting is implemented by modifying the rate table which is send to the kernel. No direct parameter were transferred to the kernel indicating the linklayer setting. The commit 56b765b79 ("htb: improved accuracy at high rates") removed the use of the rate table system. To keep compatible with older iproute2 utils, this patch detects the linklayer by parsing the rate table. It also supports future versions of iproute2 to send this linklayer parameter to the kernel directly. This is done by using the __reserved field in struct tc_ratespec, to convey the choosen linklayer option, but only using the lower 4 bits of this field. Linklayer detection is limited to speeds below 100Mbit/s, because at high rates the rtab is gets too inaccurate, so bad that several fields contain the same values, this resembling the ATM detect. Fields even start to contain "0" time to send, e.g. at 1000Mbit/s sending a 96 bytes packet cost "0", thus the rtab have been more broken than we first realized. Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | input: Add MSC_TIMESEC/_TIMEUSEC for androidXiaohui Tao2013-09-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventhub defines two entries: MSC_ANDROID_TIME_SEC 0x6 MSC_ANDROID_TIME_USEC 0x7 to pass the timestamp from the linux kernel to android if the input devices have a better concetp of the time. These two entries conflict with MSC_ACTIVITY which is used for CPU_BOOST, which causes the first touc does not work after lp0. Add the two entries in input.h to match with android layer. Bug 1354400 Change-Id: I5cc9b2605db609cebad96ad1b95433fa333e77f7 Signed-off-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-on: http://git-master/r/266219 Reviewed-by: Mitch Luban <mluban@nvidia.com> Tested-by: Mitch Luban <mluban@nvidia.com>
* | | Input: touch: synaptics: Direct Touch kernel files.Xiaohui Tao2013-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code drop from synaptics Below is the detailed description of the change: * Support for multiple RMI4 devices has been added. * The Kconfig options have been further simplified. CONFIG_RMI4_BUS and CONFIG_RMI4_GENERIC are replaced by a single control, CONFIG_RMI4_CORE. You'll need to update your defconfig file appropriately. * some debugfs and sysfs files have moved around. If you have tools or scripts that depend on these files, you'll need to update the paths. * The driver_name field of rmi_device_platform_data has been removed, as it was no longer necessary. * Polling support has been added. Polling works on I2C and SPIv1. It does not work for SPIv2, since that requires a working ATTN line. * A sensor_type field has been added to the F11 per-sensor platform data. This allows you to specify whether the device is touchscreen or touchpad type sensor in cases where the register map does not allow this to be determined programmatically. * F11 platform data has been updated to a per-sensor basis (remember that a single F11 module might have more than one 2D sensor attached to it). * F11 virtual button maps have been switched to a per-sensor basis. * F11 Type B support is always on, and removed from Kconfig. Per-sensor platformdata is provided if you need to force Multifinger Type A input. * IMPORTANT: the RMI4 driver has been converted over to the Linux kernel bus and driver model. This means that the sysfs file structure has changed. Some files have moved to debugfs, and for remaining files, the sysfs tree structure has changed. Refer to Documentation/ABI/testing/debugfs-rmi4 and sysfs-rmi4 for full details. * ALSO IMPORTANT: The Kconfig options have been simplified. Several have been eliminated, and others have been consolidated. Please consult Kconfig and make any necessary related changes to your kernel configuration. * ATTN interrupts are not enabled until the F01 function driver is bound to the sensor. This should eliminate spurious interrupts that were seen during the system bootup process. Bug 960856 Bug 1253719 Change-Id: I773ec9210e0d6c7e8f03d551ca61bbda156080f7 Signed-off-by: Xiaohui Tao <xtao@nvidia.com> Reviewed-on: http://git-master/r/130310 Reviewed-by: Seema Khowala <seemaj@nvidia.com> Tested-by: Seema Khowala <seemaj@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
* | | Input: add MSC_ACTIVITY event for reporting early input activityYogish Kulkarni2013-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Input devices which depends on host processor for converting raw samples to input event needs to report early event so that CPU frequency governor can act to boost process of converting raw samples to input event data. Direct touch technology based device is an example where computation happens on CPU instead of dedicated controller. Bug 1229219 Change-Id: I404fb30e2a05f8092d194825488db017e7e935af Signed-off-by: Yogish Kulkarni <yogishk@nvidia.com> Reviewed-on: http://git-master/r/196737 (cherry picked from commit 39614533cbc98531d5ecaca08cbb0145161d2eb3) Reviewed-on: http://git-master/r/200761 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* | | mac80211&nl80211: support to abort a scan request on txWei Ni2013-09-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mac80211 & nl80211: add support to abort a scan request on tx The original issue is the chromium issue: http://code.google.com/p/chromium-os/issues/detail?id=11485 This fix comes from: https://gerrit.chromium.org/gerrit/#change,5744 https://gerrit.chromium.org/gerrit/#change,5745 Since this change is for ChromeOs and will affect Android P2P function, so we add config option MAC80211_SCAN_ABORT for it. Bug 1051830 Change-Id: I77504f4d279f3f3d99b5e5f9d734480888d62193 Signed-off-by: Wei Ni <wni@nvidia.com> Reviewed-on: http://git-master/r/160777 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rhyland Klein <rklein@nvidia.com> Reviewed-by: Bibhay Ranjan <bibhayr@nvidia.com> Tested-by: Bibhay Ranjan <bibhayr@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
* | | usb: gadget: phonet: Add Phonet over ACM for RMCBH Hsieh2013-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * As submitted by RMC for modem support * Add Phonet over ACM support for RMC PegaPCI Bug 1066582 Bug 1167013 Change-Id: Id7883e30767d47200a1ed8ccb4e79f01a30c7a06 Signed-off-by: BH Hsieh <bhsieh@nvidia.com> Reviewed-on: http://git-master/r/160149 (cherry picked from commit 17ad36b016454666bf3c81036fe3d4e6987be591) Reviewed-on: http://git-master/r/162772 GVS: Gerrit_Virtual_Submit Reviewed-by: Steve Lin <stlin@nvidia.com>
* | | drivers: net: Modifications for RMC PegaPCI.Raj Jayaraman2013-09-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * As submitted by RMC for modem support * Bug 1054808 Change-Id: Ia25f0d6aaea899cb327cb2141d6896a508238c0c Signed-off-by: Raj Jayaraman <rjayaraman@nvidia.com> Reviewed-on: http://git-master/r/160032 (cherry picked from commit a81627cafe577dc5f640feb11596d485200c4c0d) Reviewed-on: http://git-master/r/162292 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: WK Tsai <wtsai@nvidia.com> Reviewed-by: Steve Lin <stlin@nvidia.com>
* | | net: phonet: Modifications for RMC PegaPCI.Raj Jayaraman2013-09-142-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * As submitted by RMC for modem support * Bug 1054808 Change-Id: I6674df1870dea09e3a1b6035d2d8218e2f56de3b Signed-off-by: Raj Jayaraman <rjayaraman@nvidia.com> Reviewed-on: http://git-master/r/160031 (cherry picked from commit 60564998c44336e29d653e7d10a20555f0a5703b) Reviewed-on: http://git-master/r/162291 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: WK Tsai <wtsai@nvidia.com> Reviewed-by: Steve Lin <stlin@nvidia.com>
* | | Merge commit 'a88f9e27498afaea615ad3e93af4f26df1f84987' into ↵Dan Willemsen2013-09-146-1/+35
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after-upstream-android Conflicts: arch/arm/common/Kconfig arch/arm/mm/Makefile arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c drivers/input/Kconfig drivers/input/Makefile drivers/power/Kconfig kernel/futex.c
| * | netfilter: xt_IDLETIMER: Add new netlink msg typeJP Abgrall2013-07-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send notifications when the label becomes active after an idle period. Send netlink message notifications in addition to sysfs notifications. Using a uevent with subsystem=xt_idletimer INTERFACE=... STATE={active,inactive} This is backport from common android-3.0 commit: beb914e987cbbd368988d2b94a6661cb907c4d5a with uevent support instead of a new netlink message type. Change-Id: I31677ef00c94b5f82c8457e5bf9e5e584c23c523 Signed-off-by: Ashish Sharma <ashishsharma@google.com> Signed-off-by: JP Abgrall <jpa@google.com>
| * | nf: xt_socket: export the fancy sock finder codeJP Abgrall2013-07-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The socket matching function has some nifty logic to get the struct sock from the skb or from the connection tracker. We export this so other xt_* can use it, similarly to ho how xt_socket uses nf_tproxy_get_sock. Change-Id: I11c58f59087e7f7ae09e4abd4b937cd3370fa2fd Signed-off-by: JP Abgrall <jpa@google.com>
| * | net: add PPP on PPTP Network Server (PPPoPNS) driver.Chia-chi Yeh2013-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chia-chi Yeh <chiachi@android.com> ppopns: dont include px_proto define in if_pppopns.h Change-Id: I27e687667db5b45182562f4a517a2e6cec6b1350 Signed-off-by: Dima Zavin <dima@android.com>
| * | net: add PPP on L2TP Access Concentrator (PPPoLAC) driver.Chia-chi Yeh2013-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ae3ee7520951ae24269db0ef2898c6455cf6bcc Signed-off-by: Chia-chi Yeh <chiachi@android.com> ppolac: dont include px_proto define in if_pppolac.h Change-Id: I55bc9cf91ea0e9e8f7bf5d6e241d188e1269343a Signed-off-by: Dima Zavin <dima@android.com>
| * | FAT: Add new ioctl VFAT_IOCTL_GET_VOLUME_ID for reading the volume ID.Mike Lockwood2013-07-011-0/+12
| | | | | | | | | | | | Signed-off-by: Brian Swetland <swetland@google.com>
| * | net: socket ioctl to reset connections matching local addressRobert Love2013-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new socket ioctl, SIOCKILLADDR, that nukes all sockets bound to the same local address. This is useful in situations with dynamic IPs, to kill stuck connections. Signed-off-by: Brian Swetland <swetland@google.com> net: fix tcp_v4_nuke_addr Signed-off-by: Dima Zavin <dima@android.com> net: ipv4: Fix a spinlock recursion bug in tcp_v4_nuke. We can't hold the lock while calling to tcp_done(), so we drop it before calling. We then have to start at the top of the chain again. Signed-off-by: Dima Zavin <dima@android.com> net: ipv4: Fix race in tcp_v4_nuke_addr(). To fix a recursive deadlock in 2.6.29, we stopped holding the hash table lock across tcp_done() calls. This fixed the deadlock, but introduced a race where the socket could die or change state. Fix: Before unlocking the hash table, we grab a reference to the socket. We can then unlock the hash table without risk of the socket going away. We then lock the socket, which is safe because it is pinned. We can then call tcp_done() without recursive deadlock and without race. Upon return, we unlock the socket and then unpin it, killing it. Change-Id: Idcdae072b48238b01bdbc8823b60310f1976e045 Signed-off-by: Robert Love <rlove@google.com> Acked-by: Dima Zavin <dima@android.com> ipv4: disable bottom halves around call to tcp_done(). Signed-off-by: Robert Love <rlove@google.com> Signed-off-by: Colin Cross <ccross@android.com> ipv4: Move sk_error_report inside bh_lock_sock in tcp_v4_nuke_addr When sk_error_report is called, it wakes up the user-space thread, which then calls tcp_close. When the tcp_close is interrupted by the tcp_v4_nuke_addr ioctl thread running tcp_done, it leaks 392 bytes and triggers a WARN_ON. This patch moves the call to sk_error_report inside the bh_lock_sock, which matches the locking used in tcp_v4_err. Signed-off-by: Colin Cross <ccross@android.com>
| * | Input: evdev - Add ioctl to block suspend while event queue is not empty.Arve Hjønnevåg2013-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a wakelock that will block suspend while the event queue is not empty. This allows userspace code to process input events while the device appears to be asleep. The current code holds the wakelock for up 5 seconds for every input device and client. This can prevent suspend if sensor with a high data rate is active, even when that sensor is not capable of waking the device once it is suspended. Change-Id: I624d66ef30a0b3abb543685c343382b8419b42b9 Signed-off-by: Arve Hjønnevåg <arve@android.com>
* | | Merge branch 'buckets/video' into after-bucketsDan Willemsen2013-09-141-0/+13
|\ \ \
| * | | HDMI stereo support - kernel code changeschzhang2013-09-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chong Zhang <chzhang@nvidia.com> Original-Change-Id: I53eea3b14852aecd589dfbd0461258e064835cc9 Reviewed-on: http://git-master/r/11405 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Rebase-Id: R4c2c1bba6eeeee16cf3d99061717c236c695eaf7
| * | | video: fbmon: Add support for CEA pixel ratios.Lajos Molnar2013-09-141-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEA defines multiple timings with dual timing ratios that cannot be distinguished from timings parameters. Added 2 new fb flags to specify 4:3 or 16:9 display ratios. Also added a flag that denotes CEA formats that require repeating pixels. Change-Id: I75d413babdcb4048a0ccce6548ed386ad0e52318 Signed-off-by: Lajos Molnar <molnar@ti.com> Rebase-Id: Re8a9c83e4707ae0ffabf4f2a539758faeacd6211
* | | Merge branch 'buckets/serial' into after-bucketsDan Willemsen2013-09-141-4/+6
|\ \ \
| * | | serial: 8250: support auto control of RTSCTS on tegra typePradeep Goudagunta2013-09-141-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add UART_CAP_HW_CTSRTS flag to tegra type for supporting auto control of RTSCTS. Bug 803910 Original-Change-Id: I7b69e4b203e66903ba5755338fcb55f4a87b9a43 Reviewed-on: http://git-master/r/24463 Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Rebase-Id: R3d534669876a75c3d72ed9eb6b878915a2d96e71
* / / [ARM]tegra:i2c: Adding i2c slave support apis.Laxman Dewangan2013-09-141-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To support the i2c slave functionality in the kernel, adding the framework so that chip specific slave driver can be plugged in. Adding slave adapter and alogithms in framework so that slave bus driver can register chip specific driver. Original-Change-Id: Ie002dbd3b021f70814b455471e66a5da378ab3e9 Reviewed-on: http://git-master/r/14206 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Alok Chauhan <alokc@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Original-Change-Id: I92b6bc4f3953a9edc7f9414a65b69005d2bbf8db Rebase-Id: R13abe740fa88a76747dcbcd42ffc9f74a504f7c5
* | firewire: fix libdc1394/FlyCap2 iso event regressionClemens Ladisch2013-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0699a73af3811b66b1ab5650575acee5eea841ab upstream. Commit 18d627113b83 (firewire: prevent dropping of completed iso packet header data) was intended to be an obvious bug fix, but libdc1394 and FlyCap2 depend on the old behaviour by ignoring all returned information and thus not noticing that not all packets have been received yet. The result was that the video frame buffers would be saved before they contained the correct data. Reintroduce the old behaviour for old clients. Tested-by: Stepan Salenikovich <stepan.salenikovich@gmail.com> Tested-by: Josep Bosch <jep250@gmail.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | net: Swap ver and type in pppoe_hdrChangli Gao2013-07-281-2/+2
|/ | | | | | | | | | [ Upstream commit b1a5a34bd0b8767ea689e68f8ea513e9710b671e ] Ver and type in pppoe_hdr should be swapped as defined by RFC2516 section-4. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* netlink: export netlink_diag.h headerstephen hemminger2013-06-191-0/+1
| | | | | | | | The netlink_diag.h is in include/uapi/linux but not in the Kbuild necessary to cause it to be exported by make headers_install. Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* kvm: Add definition of KVM_REG_MIPSDavid Daney2013-06-111-0/+1
| | | | | | | | We use 0x7000000000000000ULL as 0x6000000000000000ULL is reserved for ARM64. Signed-off-by: David Daney <david.daney@cavium.com> Signed-off-by: Gleb Natapov <gleb@redhat.com>
* virtio_console: fix uapi headerMichael S. Tsirkin2013-05-201-1/+1
| | | | | | | | | uapi should use __u32 not u32. Fix a macro in virtio_console.h which uses u32. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: stable@kernel.org
* Merge git://git.infradead.org/users/eparis/auditLinus Torvalds2013-05-111-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull audit changes from Eric Paris: "Al used to send pull requests every couple of years but he told me to just start pushing them to you directly. Our touching outside of core audit code is pretty straight forward. A couple of interface changes which hit net/. A simple argument bug calling audit functions in namei.c and the removal of some assembly branch prediction code on ppc" * git://git.infradead.org/users/eparis/audit: (31 commits) audit: fix message spacing printing auid Revert "audit: move kaudit thread start from auditd registration to kaudit init" audit: vfs: fix audit_inode call in O_CREAT case of do_last audit: Make testing for a valid loginuid explicit. audit: fix event coverage of AUDIT_ANOM_LINK audit: use spin_lock in audit_receive_msg to process tty logging audit: do not needlessly take a lock in tty_audit_exit audit: do not needlessly take a spinlock in copy_signal audit: add an option to control logging of passwords with pam_tty_audit audit: use spin_lock_irqsave/restore in audit tty code helper for some session id stuff audit: use a consistent audit helper to log lsm information audit: push loginuid and sessionid processing down audit: stop pushing loginid, uid, sessionid as arguments audit: remove the old depricated kernel interface audit: make validity checking generic audit: allow checking the type of audit message in the user filter audit: fix build break when AUDIT_DEBUG == 2 audit: remove duplicate export of audit_enabled Audit: do not print error when LSMs disabled ...
| * audit: Make testing for a valid loginuid explicit.Eric W. Biederman2013-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audit rule additions containing "-F auid!=4294967295" were failing with EINVAL because of a regression caused by e1760bd. Apparently some userland audit rule sets want to know if loginuid uid has been set and are using a test for auid != 4294967295 to determine that. In practice that is a horrible way to ask if a value has been set, because it relies on subtle implementation details and will break every time the uid implementation in the kernel changes. So add a clean way to test if the audit loginuid has been set, and silently convert the old idiom to the cleaner and more comprehensible new idiom. Cc: <stable@vger.kernel.org> # 3.7 Reported-By: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Tested-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
| * audit: add an option to control logging of passwords with pam_tty_auditRichard Guy Briggs2013-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Most commands are entered one line at a time and processed as complete lines in non-canonical mode. Commands that interactively require a password, enter canonical mode to do this while shutting off echo. This pair of features (icanon and !echo) can be used to avoid logging passwords by audit while still logging the rest of the command. Adding a member (log_passwd) to the struct audit_tty_status passed in by pam_tty_audit allows control of canonical mode without echo per task. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2013-05-091-2/+30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs update from Chris Mason: "These are mostly fixes. The biggest exceptions are Josef's skinny extents and Jan Schmidt's code to rebuild our quota indexes if they get out of sync (or you enable quotas on an existing filesystem). The skinny extents are off by default because they are a new variation on the extent allocation tree format. btrfstune -x enables them, and the new format makes the extent allocation tree about 30% smaller. I rebased this a few days ago to rework Dave Sterba's crc checks on the super block, but almost all of these go back to rc6, since I though 3.9 was due any minute. The biggest missing fix is the tracepoint bug that was hit late in 3.9. I ran into problems with that in overnight testing and I'm still tracking it down. I'll definitely have that fixed for rc2." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (101 commits) Btrfs: allow superblock mismatch from older mkfs btrfs: enhance superblock checks btrfs: fix misleading variable name for flags btrfs: use unsigned long type for extent state bits Btrfs: improve the loop of scrub_stripe btrfs: read entire device info under lock btrfs: remove unused gfp mask parameter from release_extent_buffer callchain btrfs: handle errors returned from get_tree_block_key btrfs: make static code static & remove dead code Btrfs: deal with errors in write_dev_supers Btrfs: remove almost all of the BUG()'s from tree-log.c Btrfs: deal with free space cache errors while replaying log Btrfs: automatic rescan after "quota enable" command Btrfs: rescan for qgroups Btrfs: split btrfs_qgroup_account_ref into four functions Btrfs: allocate new chunks if the space is not enough for global rsv Btrfs: separate sequence numbers for delayed ref tracking and tree mod log btrfs: move leak debug code to functions Btrfs: return free space in cow error path Btrfs: set UUID in root_item for created trees ...
| * | Btrfs: rescan for qgroupsJan Schmidt2013-05-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If qgroup tracking is out of sync, a rescan operation can be started. It iterates the complete extent tree and recalculates all qgroup tracking data. This is an expensive operation and should not be used unless required. A filesystem under rescan can still be umounted. The rescan continues on the next mount. Status information is provided with a separate ioctl while a rescan operation is in progress. Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
| * | Btrfs: allow omitting stream header and end-cmd for btrfs sendStefan Behrens2013-05-061-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two new flags are added to allow omitting the stream header and the end command for btrfs send streams. This is used in cases where you send multiple snapshots back-to-back in one stream. This used to be encoded like this (with 2 snapshots in this example): <stream header> + <sequence of commands> + <end cmd> + <stream header> + <sequence of commands> + <end cmd> + EOF The new format (if the two new flags are used) is this one: <stream header> + <sequence of commands> + <sequence of commands> + <end cmd> Note that the currently existing receivers treat <end cmd> only as an indication that a new <stream header> is following. This means, you can just skip the sequence <end cmd> <stream header> without loosing compatibility. As long as an EOF is following, the currently existing receivers handle the new format (if the two new flags are used) exactly as the old one. So what is the benefit of this change? The goal is to be able to use a single stream (one TCP connection) to multiplex a request/response handshake plus Btrfs send streams, all in the same stream. In this case you cannot evaluate an EOF condition as an end of the Btrfs send stream. You need something else, and the <end cmd> is just perfect for this purpose. The summary is: The format change is driven by the need to send several Btrfs send streams over a single TCP connections, with the ability for a repeated request/response handshake in the middle. And this format change does not break any existing tool, it is completely compatible. You could compare the old behaviour of the Btrfs send stream to the one of ftp where you need a seperate request/response channel and newly opened data transfer channels for each file, while the new behaviour is more like http using a single stream for everything. Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
* | | if_cablemodem.h: Add parenthesis around ioctl macrosJosh Boyer2013-05-081-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Protect the SIOCGCM* ioctl macros with parenthesis. Reported-by: Paul Wouters <pwouters@redhat.com> Signed-off-by: Josh Boyer <jwboyer@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-12 09:36:42 +0000