gianfar: fix compile fail for NET_POLL=y due to struct packing
Commit ee873fda3b
("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: Benjamin 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: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
da8c87241c
commit
62ed839dba
|
@ -2906,21 +2906,23 @@ static void gfar_netpoll(struct net_device *dev)
|
|||
/* If the device has multiple interrupts, run tx/rx */
|
||||
if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
|
||||
for (i = 0; i < priv->num_grps; i++) {
|
||||
disable_irq(priv->gfargrp[i].interruptTransmit);
|
||||
disable_irq(priv->gfargrp[i].interruptReceive);
|
||||
disable_irq(priv->gfargrp[i].interruptError);
|
||||
gfar_interrupt(priv->gfargrp[i].interruptTransmit,
|
||||
&priv->gfargrp[i]);
|
||||
enable_irq(priv->gfargrp[i].interruptError);
|
||||
enable_irq(priv->gfargrp[i].interruptReceive);
|
||||
enable_irq(priv->gfargrp[i].interruptTransmit);
|
||||
struct gfar_priv_grp *grp = &priv->gfargrp[i];
|
||||
|
||||
disable_irq(gfar_irq(grp, TX)->irq);
|
||||
disable_irq(gfar_irq(grp, RX)->irq);
|
||||
disable_irq(gfar_irq(grp, ER)->irq);
|
||||
gfar_interrupt(gfar_irq(grp, TX)->irq, grp);
|
||||
enable_irq(gfar_irq(grp, ER)->irq);
|
||||
enable_irq(gfar_irq(grp, RX)->irq);
|
||||
enable_irq(gfar_irq(grp, TX)->irq);
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < priv->num_grps; i++) {
|
||||
disable_irq(priv->gfargrp[i].interruptTransmit);
|
||||
gfar_interrupt(priv->gfargrp[i].interruptTransmit,
|
||||
&priv->gfargrp[i]);
|
||||
enable_irq(priv->gfargrp[i].interruptTransmit);
|
||||
struct gfar_priv_grp *grp = &priv->gfargrp[i];
|
||||
|
||||
disable_irq(gfar_irq(grp, TX)->irq);
|
||||
gfar_interrupt(gfar_irq(grp, TX)->irq, grp);
|
||||
enable_irq(gfar_irq(grp, TX)->irq);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue