Commit 62ed839d authored by Paul Gortmaker's avatar Paul Gortmaker Committed by David S. Miller

gianfar: fix compile fail for NET_POLL=y due to struct packing

Commit ee873fda ("gianfar: Pack struct
gfar_priv_grp into three cachelines") moved the irq number and names
off into a separate struct and created accessors for them.  However
it was never tested with NET_POLL enabled, and so some conversions
that were simply overlooked went undetected until now.

Make the netpoll ones also use the gfar_irq() accessors.
Reported-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
Cc: Jianhua Xie <jianhua.xie@freescale.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da8c8724
...@@ -2906,21 +2906,23 @@ static void gfar_netpoll(struct net_device *dev) ...@@ -2906,21 +2906,23 @@ static void gfar_netpoll(struct net_device *dev)
/* If the device has multiple interrupts, run tx/rx */ /* If the device has multiple interrupts, run tx/rx */
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) { if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
for (i = 0; i < priv->num_grps; i++) { for (i = 0; i < priv->num_grps; i++) {
disable_irq(priv->gfargrp[i].interruptTransmit); struct gfar_priv_grp *grp = &priv->gfargrp[i];
disable_irq(priv->gfargrp[i].interruptReceive);
disable_irq(priv->gfargrp[i].interruptError); disable_irq(gfar_irq(grp, TX)->irq);
gfar_interrupt(priv->gfargrp[i].interruptTransmit, disable_irq(gfar_irq(grp, RX)->irq);
&priv->gfargrp[i]); disable_irq(gfar_irq(grp, ER)->irq);
enable_irq(priv->gfargrp[i].interruptError); gfar_interrupt(gfar_irq(grp, TX)->irq, grp);
enable_irq(priv->gfargrp[i].interruptReceive); enable_irq(gfar_irq(grp, ER)->irq);
enable_irq(priv->gfargrp[i].interruptTransmit); enable_irq(gfar_irq(grp, RX)->irq);
enable_irq(gfar_irq(grp, TX)->irq);
} }
} else { } else {
for (i = 0; i < priv->num_grps; i++) { for (i = 0; i < priv->num_grps; i++) {
disable_irq(priv->gfargrp[i].interruptTransmit); struct gfar_priv_grp *grp = &priv->gfargrp[i];
gfar_interrupt(priv->gfargrp[i].interruptTransmit,
&priv->gfargrp[i]); disable_irq(gfar_irq(grp, TX)->irq);
enable_irq(priv->gfargrp[i].interruptTransmit); gfar_interrupt(gfar_irq(grp, TX)->irq, grp);
enable_irq(gfar_irq(grp, TX)->irq);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment