diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-06-27 08:08:22 +0200 |
| commit | a9e94ec3504ead4b87a929bc57f5aa99a6590437 (patch) | |
| tree | b6e7aaec0e844dc066e93296a85e5769542ef525 /arch/powerpc/sysdev/xics/ics-opal.c | |
| parent | Merge tag 'fcoe' into fixes (diff) | |
| parent | fcoe: Use correct API to set vlan tag for FCoE Ethertype skbs (diff) | |
| download | linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.tar.xz linux-a9e94ec3504ead4b87a929bc57f5aa99a6590437.zip | |
Merge tag 'fcoe1' into fixes
This patch fixes a critical bug that was introduced in 3.9
related to VLAN tagging FCoE frames.
Diffstat (limited to 'arch/powerpc/sysdev/xics/ics-opal.c')
| -rw-r--r-- | arch/powerpc/sysdev/xics/ics-opal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c index f7e8609df0d5..39d72212655e 100644 --- a/arch/powerpc/sysdev/xics/ics-opal.c +++ b/arch/powerpc/sysdev/xics/ics-opal.c @@ -148,7 +148,7 @@ static int ics_opal_set_affinity(struct irq_data *d, __func__, d->irq, hw_irq, server, rc); return -1; } - return 0; + return IRQ_SET_MASK_OK; } static struct irq_chip ics_opal_irq_chip = { |