Revert "UBUNTU: [Config] Enable CONFIG_NVRAM=m"

BugLink: http://bugs.launchpad.net/bugs/942193

This reverts commit 2fc20ccc8d8b2fc43fda81905eecb0c0c744cd94.

CONFIG_NVRAM was originally built in on powerpc but then changed to be
enabled as a module during the Precise config review as there was no
supporting evidence for it to be built in.  However, there is a bug
report stating that this change prevents 'ybin' (the program which
configures the PowerPC bootloader) from working.  So revert this change
and follow up with another commit to add this to the enforcer.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] Added hv_netvsc and hv_storvsc to -virtual

BugLink: http://bugs.launchpad.net/bugs/942256

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Ubuntu: Rebase to v3.2.8

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: SAUCE: Input: synapticss - Set buttonpad property for all clickpads

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: Input: synaptics - add second variant of two-button clickpad

This is necessary for clickpad detection of Synaptics trackpads in Dell
Mini 10 series of laptops.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: (drop after 3.3) HID: hid-magicmouse: Add pointer and buttonpad properties for Magic Trackpad

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

(cherry picked from commit 503f7d53b368c8e4e13a7756220c0536fcf1a034 from
Jiri Kosina's HID for-next branch)
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: [Config] updateconfigs after apparmor patches

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Revert "UBUNTU: SAUCE: AppArmor: Allow dfa backward compatibility with broken userspace"

This reverts commit b6b48be457cc8108d0e21a642c8fda7173ac18a1.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Revert "AppArmor: compatibility patch for v5 network controll"

This reverts commit d253e5fb4a6b552e7cd2a3c80934ab4f92faec97.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Revert "AppArmor: compatibility patch for v5 interface"

This reverts commit 56f928f0cbf810c047a9a72e4e5c4840800437ec.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Revert "UBUNTU: SAUCE: AppArmor: Fix unpack of network tables."

This reverts commit 122a0a96237fd774693d7c4324f9da90545eef15.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Revert "Revert "ath9k_hw: fix interpretation of the rx KeyMiss flag""

This reverts commit c300a03ec3d7de946d3fc7904dd9571bd8c53923.

We had originally reverted "ath9k_hw: fix interpretation of the rx
KeyMiss flag" due to a regression it introduced (LP:923512).  It appears
a proper fix has come through via upstream stable:

  commit 07c07e52693740326b24511ba6053f3fd52c0942
  Author: Felix Fietkau <nbd@openwrt.org>
  Date:   Sun Feb 5 21:15:17 2012 +0100

    ath9k: fix a WEP crypto related regression

Revert the original revert in favor of the upstream fix.  We can rebase
these out of existence upon the next rebase.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] Enable CONFIG_USB_SERIAL_QUATECH_USB2=m on arm and powerpc

Per the Precise config review, enable CONFIG_USB_SERIAL_QUATECH_USB2=m
on arm and powerpc for consistency across all flavors and arch's.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] Enable CONFIG_USB_SERIAL_QUATECH2=m on arm and powerpc

Per the Precise config review, enable CONFIG_USB_SERIAL_QUATECH2=m on
arm and powerpc for consistency across all flavors and arch's.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Rebase to v3.2.7

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: ubuntu: AUFS -- update to d266b0c5d0693d6383976ee54b9e2c0fa9a3f5b0

Andy Whitcroft (1):
      UBUNTU: ubuntu: AUFS -- suppress benign plink warning messages

J. R. Okajima (10):
      aufs: headers 1/2, bugfix, where the pr_fmt macro definition
      aufs: headers 2/2, simply refined
      aufs: tiny, update the year
      aufs: update the donator
      aufs stdalone: include path in Makefile
      aufs: tiny, update the year
      aufs: tiny, remove a duplicated header by accident
      aufs: tiny, restore the removed header files for 2.6.38
      make aufs-version 3.2
      aufs3.2 20120109

Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: ubuntu: AUFS -- sort out the relative header paths

Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: ubuntu: AUFS -- adapt to the new changelog handling

Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-3.2.0-17.27

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: SAUCE: drm/i915: fix operator precedence when enabling RC6p

As noticed by Torsten Kaiser, the operator precedence can play tricks
with us here.

CC: Dave Airlie <airlied at redhat.com>
CC: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: Ubuntu-3.2.0-17.26

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

Input: bcm5974 - set BUTTONPAD property

Some bcm5974 trackpads have a physical button beneath the physical surface.
This patch sets the property bit so user space applications can detect the
trackpad type and act accordingly.

Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
(cherry picked from commit 52965cc012f7a3cf35f06485ec275ebf3b3fddae)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: SAUCE: drm/i915: Enable RC6 by default on sandybridge.

Intel claims that RC6 issues are triggered by RC6+ states and that plain
RC6 is the one responsible for most energy savings.  So in an effort to
provide our Sandy Bridge users the most power savings by default, we
applied a patch to disable RC6p on Sandy Bridge.  As a follow on, this
patch then enables RC6 by default.

Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: SAUCE: drm/i915: do not enable RC6p on Sandy Bridge

With base on latest findings, RC6p seems to be respondible for RC6-related
issues on Sandy Bridge platform. To work-around those issues, the previous
solution was to completely disable RC6 on Sandy Bridge for the past few
releases, even if plain RC6 was not giving any issues.

What this patch does is preventing RC6p from being enabled on Sandy Bridge
even if users enable RC6 via a kernel parameter. So it won't change the
defaults in any way, but will ensure that if users do enable RC6 manually
it won't break their machines by enabling this extra state.

Proper fix for this (enabling specific RC6 states according to the GPU
generation) were proposed for the -next kernel, but we are too late in the
release process now to pick such changes.

CC: Keith Packard <keithp@keithp.com>
CC: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

UBUNTU: [Config] CONFIG_X86_NUMACHIP=y

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

x86/numachip: Drop unnecessary conflict with EDAC

EDAC detection no longer crashes multi-node systems, so don't
conflict on it with NumaChip.

Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Steffen Persvold <sp@numascale.com>
Link: http://lkml.kernel.org/r/1327473349-28395-1-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
(cherry picked from commit 3fe54564a61f72982032423d24041dca30617ca2)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

x86: Add NumaChip support

Adds support for Numascale NumaChip large-SMP systems. It is
needed to enable the booting of more than ~168 cores.

v2:
 - [Steffen] enumerate only accessible northbridges
 - [Daniel] rediffed and validated against 3.1-rc10

v3:
 - [Daniel] use x86_init core numbering override
 - [Daniel] cleanups as per feedback

v4:
 - [Daniel] use updated x86_cpuinit override

v5:
 - drop disabling interrupts locally, as ISR write is atomic; drop delay
 - added read-mostly annotations where appropriate
 - require CONFIG_SMP, so drop conditional path

Workload tested on 96 cores/16 sockets.

Signed-off-by: Steffen Persvold <sp@numascale.com>
Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Link: http://lkml.kernel.org/r/1323101246-2400-1-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
(cherry picked from commit 44b111b519160e33fdc41eadb39af86a24707edf)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

x86: Add x86_init platform override to fix up NUMA core numbering

Add an x86_init vector for handling inconsistent core numbering.
This is useful for multi-fabric platforms, such as Numascale
NumaConnect.

v2:
 - use struct x86_cpuinit_ops
 - provide default fall-back function to warn

Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Link: http://lkml.kernel.org/r/1323073238-32686-2-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
(cherry picked from commit 64be4c1c2428e148de6081af235e2418e6a66dda)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

x86: Make flat_init_apic_ldr() available

Allow flat_init_apic_ldr() to be used outside the compilation
unit for similar APIC implementations.

Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Steffen Persvold <sp@numascale.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Link: http://lkml.kernel.org/r/1323073238-32686-1-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
(cherry picked from commit 9a0ebfbe3f1007008d198ccc6b86783cdb312fec)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: security: unconditionally chain to Yama LSM

This patch forces the LSM to always chain through the Yama LSM
regardless of which LSM is selected as the primary LSM.

This is not intended for upstream. This is, however, what Ubuntu
and ChromeOS are doing.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: Yama: add link restrictions

Add symlink and hardlink restrictions that have shown real-world security
benefits, along with sysctl knobs to control them.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: (drop after 3.3) Yama: add PR_SET_PTRACER_ANY

For a process to entirely disable ptrace restrictions, it can use the
special PR_SET_PTRACER_ANY pid to indicate that any otherwise allowed
process may ptrace it. This is stronger than calling PR_SET_PTRACER with
pid "1" because it includes processes in external pid namespaces.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: (drop after 3.3) security: Yama LSM

This adds the Yama Linux Security Module to collect DAC security
improvements (specifically just ptrace restrictions for now) that have
existed in various forms over the years and have been carried outside the
mainline kernel by other Linux distributions like Openwall and grsecurity.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: SAUCE: (drop after 3.3) security: create task_free security callback

The current LSM interface to cred_free is not sufficient for allowing
an LSM to track the life and death of a task. This patch adds the
task_free hook so that an LSM can clean up resources on task death.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

UBUNTU: deviations -- note the source of the Hyper-V updates

Note where we are getting the Hyper-V updates and why.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

UBUNTU: dropped hv_mouse

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Move the storage driver out of the staging area

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Consolidate all the wire protocol definitions

Consolidate all definitions that support communication with the host.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Consolidate the request structure

Consolidate the request structure by getting rid of struct hv_storvsc_request.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Get rid of some unused defines

Get rid of some unused defines.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup some protocol related constants

Cleanup some protocol related constants.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup the code for generating protocol version

Cleanup the code for generating protocol version.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Miscellaneous cleanup of storvsc driver

Miscellaneous cleanup of storvsc driver - get rid of unnecessary defines and
use fixed size types for structures used for communication with the host.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Rename the context field in hv_storvsc_request

Rename the context field in hv_storvsc_request. As part of this change
fix the type of this field.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Get rid of the on_io_completion in hv_storvsc_request

Get rid of the on_io_completion field  in struct hv_storvsc_request. As part of this
relocate the bounce buffer handling code (to avoid having forward declarations).

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Add a comment to explain life-cycle management

Add a comment to explain life-cycle management and fix format issue.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Move and cleanup storvsc_remove()

Relocate the storvsc_remove() function to a different location in the file
and invoke scsi_host_put() only after all the cleanup.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup storvsc_host_reset_handler()

Cleanup storvsc_host_reset_handler() by getting rid of storvsc_host_reset().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Introduce defines for srb status codes

Introduce defines for srb status codes.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup storvsc_queuecommand()

Cleanup storvsc_queuecommand(). As part of this cleanup, rename the function to
check if the scsi command can be sent to the host, consolidate error recovery
and get rid of some dead code.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup storvsc_probe()

Cleanup storvsc_probe(). As part of this cleanup, get rid of
storvsc_get_ide_info() by inlining the necessary code.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup some comments

Use consistent format for comments and get rid of some unnecessary
comments.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

HID: hyperv: Properly disconnect the input device

When we unload the mouse driver, properly disconnect the input device.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Fuzhou Chen <fuzhouch@microsoft.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit c1c454b8691cc95aa83f19273ed7845914c70e83)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

HID: hv_mouse: Properly add the hid device

We need to properly add the hid device to correctly initialize the sysfs state.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Fuzhou Chen <fuzhouch@microsoft.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit 74c4fb058083b47571a4f76dcfce95085f2d8098)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

HID: Move the hid-hyperv driver out of staging

The file  hid-hyperv.c implements a hid compliant mouse driver for use on a
Hyper-V based system. This driver is currently in the staging area and as part
of the effort to move this driver out of staging, I had posted the driver code
for community review a few weeks ago. This current patch addresses all the
review comments I have gotten to date. All the relevant patches have already
been submitted to the staging tree as well.

As per Greg's suggestion, this patch does not get rid of the code from
the staging area. Once the mouse driver lands under the hid directory,
we will cleanup the staging directory.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit b95f5bcb811e3905b5376f87789da8d097fee682)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Fix the page buffer when an RNDIS message goes beyond page boundary

There is a possible data corruption if an RNDIS message goes beyond page
boundary in the sending code path. This patch fixes the problem.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit c31c151b1c4a29da4dc92212aa8648fb4f8557b9)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Use netif_tx_disable() instead of netif_stop_queue() when necessary

For code path not on the xmit, use netif_tx_disable() instead of
netif_stop_queue() to ensure other CPUs are not doing xmit.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 0a282538cc1977655004cdb2eb25dd2b63f20637)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: fix the issue that large packets be dropped under bridge

The packets with size larger than 1452 will be dropped by bridge
which with two hyperv netdevice ports. This cause by hyperv netvsc
driver always copy the trailer padding to the data packet, and then
the skb received from netdevice may include wrong skb->len (20 bytes
larger than the real size normally). The captured packet may like
this:

  Ethernet II, Src: Microsof_00:00:07 (00:15:5d:00:00:07),
               Dst: HewlettP_00:00:4e (00:1f:29:00:00:4e)
    Destination: HewlettP_e6:00:4e (00:1f:29:00:00:4e)
    Source: Microsof_f6:6d:07 (00:15:5d:f6:6d:07)
    Type: IP (0x0800)
    Trailer: 1415161718191A1B1C1D1E1F20212223
    Frame check sequence: 0x24252627 [incorrect, should be 0x7c2e5a5e]

The following command help to reproduction it, and the ping ICMP
packets will be dropped by bridge.
  $ ping ip -s 1453

This patch fixed it by removing the trailer padding from the data
packet.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 4b8a8bc9249f144803d840f2f7608ee9bbf1ea51)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: rx_bytes should account the ether header size

skb->len after call eth_type_trans() does not include the ether
header size, but rx_bytes should account it.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 48c3883999cb06246911e29356d194f96f1c75ef)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: fix possible memory leak in do_set_multicast()

do_set_multicast() may not free the memory malloc in
netvsc_set_multicast_list().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit c11bf1c8baff170fa478adc04964da519d160e62)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Add support for jumbo frame up to 64KB

Allow the user set the MTU up to 65536 for Linux guests running on
Hyper-V 2008 R2 or later.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 4d447c9a6ebc0142d320f075c5bac6d202a79fd4)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Add NETVSP protocol version negotiation

Automatically negotiate the highest protocol version mutually recognized by
both host and guest.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit f157e78de5923dfb209355f3005ce1b5d64f7998)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Remove unnecessary kmap_atomic in netvsc driver

__get_free_pages() doesn't return HI memory, so the memory is always mapped.
kmap_atomic() is not necessary here. This patch removes the kmap_atomic()
calls and related code for locking and page manipulation.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 453263421f88b4a7e508c2e7b639c97e99c5b118)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Fix the stop/wake queue mechanism

The ring buffer is only used to pass meta data for outbound packets. The
actual payload is accessed by DMA from the host. So the stop/wake queue
mechanism based on counting and comparing number of pages sent v.s. number
of pages in the ring buffer is wrong. Also, there is a race condition in
the stop/wake queue calls, which can stop xmit queue forever.

The new stop/wake queue mechanism is based on the actual bytes used by
outbound packets in the ring buffer. The check for number of outstanding
sends after stop queue prevents the race condition that can cause wake
queue happening earlier than stop queue.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reported-by: Long Li <longli@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 1d06825b0ede541f63b5577435abd2fc649a9b5e)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Add support for promiscuous mode setting

Add code to accept promiscuous mode setting, and pass it to
RNDIS filter.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit d426b2e3d91f8ec3203f8852e7ad0153b5dfdf71)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

net/hyperv: Fix long lines in netvsc.c

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit c18132005e711c07523d8c6602e5b2266ab9a0f2)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Fix a bug in create_bounce_buffer()

Set the length field of the scatter gather elements correctly when we create
the bounce buffer. When we use the bounce buffer for a "write" operation,
the act of copying to the bounce buffer, correctly deals with this issue.
However, on the "read" side, the current code was not correctly setting
the buffer length. Fix this bug. Note that when we copy from the bounce
buffer (for the read case), the amount we copy is controlled by the original
scatter gather list given to the driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Dadok Milan <dadok@kvados.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 6e8087a4fae41ae1518babbf1ef46f105d702bfd)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: update TODO file

Hank is no longer at Microsoft, so remove his email address as it
bounces.

Cc: KY Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 0c9d19646249e0124f1d82fb939e5ba76cb1af3c)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: remove hv_mouse driver as it's now in the hid directory

This removes the hv_mouse driver as it's now in Jiri's HID tree in the
"proper" place.

Cc: KY Srinivasan <kys@microsoft.com>
Cc: Jiri Kosina <jikos@jikos.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit fe17a8c009780d2fd1604a3fa0918815ba39aa8b)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Implement per device memory pools

The current code implemented a per-HBA memory pool mechanism. For IDE disks
managed by this driver, there is a one to one correspondance between the
block device and the associated virtual HBA and since currently only IDE devices
can be the boot device, this addressed the deadlock issues that were raised during
the review process. This patch implements a per-lun memory pool mechanism.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit ce3e301c442f7beffd049908a007697753766cf7)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Fix a bug in copy_from_bounce_buffer()

Fix a bug in copy_from_bounce_buffer().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 10c43dd4c4403d35fc6477d547aa3a38b466b310)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Fix a bug in storvsc_command_completion()

Fix a bug in storvsc_command_completion() that leaks memory when scatter/gather
lists are used on the "write" side.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit a768a76d55c2798bbd86b81f50ef740312d69935)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup storvsc_device_alloc()

The code in storvsc_device_alloc() is not needed as this would be
done by default. Get rid of it. We still keep the function as we use
this hook to allocate per-LUN memory pools in a later patch.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 2781866484624fabbe373b95cfd20d44d2c9a69e)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Disable clustering

Disable clustering, since the host side on Hyper-V requires that
each I/O element not exceed the page size. As part of this
cleanup, get rid of the function to merge bvecs, as the primary
reason for this function was to avoid having an element exceed
the page size.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 039db52de9c5682ee10a3cd69f2d76db40b1dee0)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Properly add the hid device

We need to properly add the hid device to correctly initialize the
sysfs state. While this patch is against the staging tree; Jiri,
please pick up this patch as you merge the Hyper-V mouse driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Fuzhou Chen <fuzhouch@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit f75c0510784e9f6ce8808b01fb826d89d0ffbcd6)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

staging: hv: move hv_netvsc out of staging area

hv_netvsc has been reviewed on netdev mailing list on 6/09/2011.
All recommended changes have been made. We are requesting to move
it out of staging area.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: KY Srinivasan <kys@microsoft.com>
Signed-off-by: Mike Sterling <Mike.Sterling@microsoft.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

staging: hv: Use kmemdup rather than duplicating its implementation

Use kmemdup rather than duplicating its implementation

The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 27b7923035f737a7e6384d0084e34706ea068040)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Support hot-removing of scsi devices

Support hot-removing of scsi devices.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit b401731985bfa7c02e4e5673a151b29ae7180fce)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Support hot add of scsi disks

Support hot add of scsi disks.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 126757998a50659f79a3f1ff23fccfc40ff1bf5c)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Upgrade the vmstor protocol version

In preparation for supporting hot add/remove of scsi devices,
upgrade the vmstor protocol version.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 2b9525f511791758b394643b61754a9688e0707d)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Get rid of an unnecessary forward declaration

Get rid of an unnecessary forward declaration.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit a404c1ff5556fe29460c097a34d2abe10ddd6e0a)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: use the macro KBUILD_MODNAME

Use the macro KBUILD_MODNAME.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit fafb0efc303a916f9902cbadddef3ea125720c1b)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Use the unlocked version queuecommand

Use the unlocked version queuecommand.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit bab445e12b45153282fb7d39143516e11987deaa)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Use the accessor function shost_priv()

Use the accessor function shost_priv().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 7f33f30a67cebbdaa938e34c5144424d2f0ce9cc)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Fix error handling storvsc_host_reset()

Fix error handling storvsc_host_reset(). I would like to thank
Long Li <longli@microsoft.com> for reporting this.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reported-by: Long Li <longli@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit a00e8224c19fa5ba3007da00d850865cbefcaabd)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Fixup the error when processing SET_WINDOW command

Fixup the error when processing SET_WINDOW command.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 59e00e744d2413430ebaa09a5fdb61e9ad02a492)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Cleanup error handling in the probe function

Cleanup error handling in the probe function.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 225ce6eab741d51d565f67ce9065c596c6535f25)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: storvsc: Use mempools to allocate struct storvsc_cmd_request

We intend to use the storage driver to manage the root device.
To avoid deadlocks, use mempools to allocate struct storvsc_cmd_request.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 4e03e697c5446146318cdb6344af0060541cbc1c)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Use the KBUILD_MODNAME macro

Use the KBUILD_MODNAME macro.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 1c7dac3269e8dc77a1b6dc08b8a7fd6731e13b7f)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Add a check to prevent memory corruption

Add a check to prevent memory corruption.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 226383751ff3ce67a648653e8bfe0842f36bbf96)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Address some style issues

Deal with some style related issues. Also get rid of an unused macro.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit dba8e1ad957e19ab42c39808a502803dc5b2dee7)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Get rid of unnecessary include files

Get rid of unnecessary include files.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit f72a1cc74f9f9f239938cbdc309c66dd87ceaf94)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Add a new line to a debug string

Add a new line to a debug string.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit f50617fabdecdc61076328b6f25d214410fb4244)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Cleanup mousevsc_on_channel_callback()

Cleanup mousevsc_on_channel_callback(). This is based on the code provided
by Joe Perches <joe@perches.com>.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 3b5632efd90a9134bc4e6a83a5e0fa26bdcac861)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Inline the code for reportdesc_callback()

Inline the code for reportdesc_callback() as this function is called from
mousevsc_probe(). As part of this, cleanup the code in reportdesc_callback().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 32325302aa94e60e843fad263ed8d20d49749f3a)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Staging: hv: mousevsc: Inline the code for mousevsc_on_device_add()

Inline the code for mousevsc_on_device_add() as this only used from
the function mousevsc_probe().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 5cf06b0de818effa5de24ba5043348a7478f87a1)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>