aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac/mal.h
diff options
context:
space:
mode:
authorRoland Dreier <rdreier@cisco.com>2007-10-09 18:48:56 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:55:32 -0400
commit59e90b2d22500f2e9cc635793562154abc8f4621 (patch)
tree99b76e904933d1cdd04a577d7c69d3a30ab116e1 /drivers/net/ibm_newemac/mal.h
parent61ba5b3c14b4956493d1180e0a860e941108393e (diff)
ibm_emac: Convert to use napi_struct independent of struct net_device
Commit da3dedd9 ("[NET]: Make NAPI polling independent of struct net_device objects.") changed the interface to NAPI polling. Fix up the ibm_newemac driver so that it works with this new interface. This is actually a nice cleanup because ibm_newemac is one of the drivers that wants to have multiple NAPI structures for a single net_device. Compile-tested only as I don't have a system that uses the ibm_newemac driver. This conversion the conversion for the ibm_emac driver that was tested on real PowerPC 440SPe hardware. Signed-off-by: Roland Dreier <rolandd@cisco.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/ibm_newemac/mal.h')
-rw-r--r--drivers/net/ibm_newemac/mal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ibm_newemac/mal.h
index 57b69dc32e9d..cb1a16d589fe 100644
--- a/drivers/net/ibm_newemac/mal.h
+++ b/drivers/net/ibm_newemac/mal.h
@@ -197,7 +197,7 @@ struct mal_instance {
197 int serr_irq; /* MAL System Error IRQ */ 197 int serr_irq; /* MAL System Error IRQ */
198 198
199 struct list_head poll_list; 199 struct list_head poll_list;
200 struct net_device poll_dev; 200 struct napi_struct napi;
201 201
202 struct list_head list; 202 struct list_head list;
203 u32 tx_chan_mask; 203 u32 tx_chan_mask;