summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-10Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/wm8510' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/ux500' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/max9768' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/log' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/jack' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/hotplug' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/da9055' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/da7210' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/ak4535' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown
2012-12-10Merge remote-tracking branch 'asoc/fix/omap' into asoc-nextMark Brown
2012-12-09cgroup: update Documentation/cgroups/00-INDEXNamjae Jeon
There are new files added to cgroup documentation. Let's update the index file to include the new files. Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com> Signed-off-by: Tejun Heo <tj@kernel.org>
2012-12-09caif_usb: Make the driver name check more efficientBen Hutchings
Use the device model to get just the name, rather than using the ethtool API to get all driver information. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09caif_usb: Check driver name before reading driver state in netdev notifierBen Hutchings
In cfusbl_device_notify(), the usbnet and usbdev variables are initialised before the driver name has been checked. In case the device's driver is not cdc_ncm, this may result in reading beyond the end of the netdev private area. Move the initialisation below the driver name check. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09virtio-net: support changing the number of queue pairs through ethtoolJason Wang
This patch implements the ethtool_{set|get}_channels method of virtio-net to allow user to change the number of queues when the device is running on demand. Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09virtio_net: multiqueue supportJason Wang
This patch adds the multiqueue (VIRTIO_NET_F_MQ) support to virtio_net driver. VIRTIO_NET_F_MQ capable device could allow the driver to do packet transmission and reception through multiple queue pairs and does the packet steering to get better performance. By default, one one queue pair is used, user could change the number of queue pairs by ethtool in the next patch. When multiple queue pairs is used and the number of queue pairs is equal to the number of vcpus. Driver does the following optimizations to implement per-cpu virt queue pairs: - select the txq based on the smp processor id. - smp affinity hint to the cpu that owns the queue pairs. This could be used with the flow steering support of the device to guarantee the packets of a single flow is handled by the same cpu. Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09virtio-net: separate fields of sending/receiving queue from virtnet_infoJason Wang
To support multiqueue transmitq/receiveq, the first step is to separate queue related structure from virtnet_info. This patch introduce send_queue and receive_queue structure and use the pointer to them as the parameter in functions handling sending/receiving. Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09vxlan: Add capability of Rx checksum offload for inner packetJoseph Gasparakis
This patch adds capability in vxlan to identify received checksummed inner packets and signal them to the upper layers of the stack. The driver needs to set the skb->encapsulation bit and also set the skb->ip_summed to CHECKSUM_UNNECESSARY. Signed-off-by: Joseph Gasparakis <joseph.gasparakis@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09vxlan: capture inner headers during encapsulationJoseph Gasparakis
Allow VXLAN to make use of Tx checksum offloading and Tx scatter-gather. The advantage to these two changes is that it also allows the VXLAN to make use of GSO. Signed-off-by: Joseph Gasparakis <joseph.gasparakis@intel.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09net: Handle encapsulated offloads before fragmentation or handing to lower devAlexander Duyck
This change allows the VXLAN to enable Tx checksum offloading even on devices that do not support encapsulated checksum offloads. The advantage to this is that it allows for the lower device to change due to routing table changes without impacting features on the VXLAN itself. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-09net: Add support for hardware-offloaded encapsulationJoseph Gasparakis
This patch adds support in the kernel for offloading in the NIC Tx and Rx checksumming for encapsulated packets (such as VXLAN and IP GRE). For Tx encapsulation offload, the driver will need to set the right bits in netdev->hw_enc_features. The protocol driver will have to set the skb->encapsulation bit and populate the inner headers, so the NIC driver will use those inner headers to calculate the csum in hardware. For Rx encapsulation offload, the driver will need to set again the skb->encapsulation flag and the skb->ip_csum to CHECKSUM_UNNECESSARY. In that case the protocol driver should push the decapsulated packet up to the stack, again with CHECKSUM_UNNECESSARY. In ether case, the protocol driver should set the skb->encapsulation flag back to zero. Finally the protocol driver should have NETIF_F_RXCSUM flag set in its features. Signed-off-by: Joseph Gasparakis <joseph.gasparakis@intel.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-08Merge branch 'nes' into for-nextRoland Dreier
2012-12-08cifs: deal with id_to_sid embedded sid reply corner caseJeff Layton
A SID could potentially be embedded inside of payload.value if there are no subauthorities, and the arch has 8 byte pointers. Allow for that possibility there. While we're at it, rephrase the "embedding" check in terms of key->payload to allow for the possibility that the union might change size in the future. Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
2012-12-08cifs: fix hardcoded default security descriptor lengthJeff Layton
It was hardcoded to 192 bytes, which was not enough when the max number of subauthorities went to 15. Redefine this constant in terms of sizeof the structs involved, and rename it for better clarity. While we're at it, remove a couple more unused constants from cifsacl.h. Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
2012-12-08cifs: extra sanity checking for cifs.idmap keysJeff Layton
Now that we aren't so rigid about the length of the key being passed in, we need to be a bit more rigorous about checking the length of the actual data against the claimed length (a'la num_subauths field). Check for the case where userspace sends us a seemingly valid key with a num_subauths field that goes beyond the end of the array. If that happens, return -EIO and invalidate the key. Also change the other places where we check for malformed keys in this code to invalidate the key as well. Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>