Drop one hunk of an rt patch applied separately in 3.2-rc7
svn path=/dists/trunk/linux-2.6/; revision=18419
This commit is contained in:
parent
cb4f2d3ab2
commit
ad7ae07d2a
|
@ -3,6 +3,7 @@ From: Thomas Gleixner <tglx@linutronix.de>
|
|||
Date: Sat, 12 Nov 2011 14:00:48 +0100
|
||||
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
[bwh: Drop hunk applied in commit 7e1e7ead88dff75b11b86ee0d5232c4591be1326]
|
||||
---
|
||||
drivers/scsi/fcoe/fcoe.c | 17 +++++++++--------
|
||||
drivers/scsi/fcoe/fcoe_ctlr.c | 4 ++--
|
||||
|
@ -46,14 +47,6 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe.c
|
|||
|
||||
return rc;
|
||||
}
|
||||
@@ -1624,6 +1624,7 @@ static inline int fcoe_filter_frames(str
|
||||
stats->InvalidCRCCount++;
|
||||
if (stats->InvalidCRCCount < 5)
|
||||
printk(KERN_WARNING "fcoe: dropping frame with CRC error\n");
|
||||
+ put_cpu();
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -1668,7 +1669,7 @@ static void fcoe_recv_frame(struct sk_bu
|
||||
*/
|
||||
hp = (struct fcoe_hdr *) skb_network_header(skb);
|
||||
|
|
Loading…
Reference in New Issue