add cifs and gro fixup patches

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 96 insertions, 0 deletions

diff --git a/queue/cifs-fix-cifs-stable-patch-cifs-fix-oplock-break-han.patch b/queue/cifs-fix-cifs-stable-patch-cifs-fix-oplock-break-han.patch
new file mode 100644
index 0000000..1cd8a39
--- /dev/null
+++ b/queue/cifs-fix-cifs-stable-patch-cifs-fix-oplock-break-han.patch
@@ -0,0 +1,45 @@
+From e3049db5726a4fcd6e9288e105b548d4ef085ae9 Mon Sep 17 00:00:00 2001
+From: Suresh Jayaraman <sjayaraman@suse.com>
+Date: Fri, 2 Dec 2011 16:24:56 +0530
+Subject: [PATCH] cifs: fix cifs stable patch
+ cifs-fix-oplock-break-handling-try-2.patch
+
+commit 4708ad6374f07cdfb379c5d4100125e2cfd339d9 in v2.6.32.x stable
+
+The stable release 2.6.32.32 added the upstream commit
+12fed00de963433128b5366a21a55808fab2f756. However, one of the hunks of
+the original patch seems missing from the stable backport which can be
+found here:
+   http://permalink.gmane.org/gmane.linux.kernel.stable/5676
+
+This hunk corresponds to the change in is_valid_oplock_break() at
+fs/cifs/misc.c.
+
+This patch backports the missing hunk and is against
+linux-2.6.32.y stable kernel.
+
+Cc: Steve French <sfrench@us.ibm.com>
+Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
+Signed-off-by: Suresh Jayaraman <sjayaraman@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+[PG: I incorrectly dropped the same hunk in v2.6.34.9-152-g0c55f20
+ since the code in question was relocated/rewritten in e66673e39a ]
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
+index d147499..ec208e6 100644
+--- a/fs/cifs/misc.c
++++ b/fs/cifs/misc.c
+@@ -584,6 +584,9 @@ is_valid_oplock_break(struct smb_hdr *buf, struct TCP_Server_Info *srv)
+ 				pCifsInode->clientCanCacheAll = false;
+ 				if (pSMB->OplockLevel == 0)
+ 					pCifsInode->clientCanCacheRead = false;
++				else if (pSMB->OplockLevel)
++					pCifsInode->clientCanCacheRead = true;
++
+ 				rc = slow_work_enqueue(&netfile->oplock_break);
+ 				if (rc) {
+ 					cERROR(1, ("failed to enqueue oplock "
+-- 
+1.7.12.1
+
diff --git a/queue/gro-reset-vlan_tci-on-reuse.patch b/queue/gro-reset-vlan_tci-on-reuse.patch
new file mode 100644
index 0000000..b3b4d44
--- /dev/null
+++ b/queue/gro-reset-vlan_tci-on-reuse.patch
@@ -0,0 +1,48 @@
+From fd6b8f9a1f338f52821982cdd33f7b188c9539d4 Mon Sep 17 00:00:00 2001
+From: Benjamin Poirier <bpoirier@suse.de>
+Date: Wed, 30 Nov 2011 07:47:18 -0500
+Subject: [PATCH] gro: reset vlan_tci on reuse
+
+This one liner is part of upstream
+commit 3701e51382a026cba10c60b03efabe534fba4ca4
+Author: Jesse Gross <jesse@nicira.com>
+
+    vlan: Centralize handling of hardware acceleration.
+
+The bulk of that commit is a rework of the hardware assisted vlan tagging
+driver interface, and as such doesn't classify for -stable inclusion. The fix
+that is needed is a part of that commit but can work independently of the
+rest.
+
+This patch can avoid panics on the 2.6.32.y -stable kernels and is in the same
+spirit as mainline commits
+66c46d7 gro: Reset dev pointer on reuse
+6d152e2 gro: reset skb_iif on reuse
+which are already in -stable.
+
+For drivers using the vlan_gro_frags() interface, a packet with an invalid tci
+leads to GRO_DROP and napi_reuse_skb(). The skb has to be sanitized before
+being reused or we may send an skb with an invalid vlan_tci field up the stack
+where it is not expected.
+
+Signed-off-by: Benjamin Poirier <bpoirier@suse.de>
+Cc: Jesse Gross <jesse@nicira.com>
+Acked-by: David S. Miller <davem@davemloft.net>
+[PG: taken from v2.6.32.y stable, commit 5aff28abc7e]
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 7daff00..2aaf2e6 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2823,6 +2823,7 @@ void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
+ {
+ 	__skb_pull(skb, skb_headlen(skb));
+ 	skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));
++	skb->vlan_tci = 0;
+ 	skb->dev = napi->dev;
+ 	skb->skb_iif = 0;
+ 
+-- 
+1.7.12.1
+
diff --git a/queue/series b/queue/series
index 53d8ba9..ecd94c1 100644
--- a/queue/series
+++ b/queue/series
@@ -8,3 +8,6 @@ ALSA-hda-Add-support-for-VMware-controller.patch
 ALSA-hda-Reduce-pci-id-list-for-Intel-with-class-id.patch
 ALSA-hda-ALSA-HD-Audio-patch-for-Intel-Panther-Point.patch
 ALSA-hda-Use-position_fix-1-for-Acer-Aspire-5538-to-.patch
+cifs-fix-cifs-stable-patch-cifs-fix-oplock-break-han.patch
+gro-reset-vlan_tci-on-reuse.patch
+