X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fnet%2Fskge.h;h=ed19ff47ce1108dc0f6a3ac89935391f7c7fa961;hb=f6e6e883730aff2718610d3eba7608fcf73328ed;hp=1f1ce88c81863ed10a7964a94936980efed56b95;hpb=e93252faca2eb1a14b44369705be7c79eba2f037;p=linux-2.6-omap-h63xx.git diff --git a/drivers/net/skge.h b/drivers/net/skge.h index 1f1ce88c818..ed19ff47ce1 100644 --- a/drivers/net/skge.h +++ b/drivers/net/skge.h @@ -2388,6 +2388,7 @@ struct skge_ring { struct skge_hw { void __iomem *regs; struct pci_dev *pdev; + spinlock_t hw_lock; u32 intr_mask; struct net_device *dev[2]; @@ -2399,9 +2400,8 @@ struct skge_hw { u32 ram_size; u32 ram_offset; u16 phy_addr; - - struct tasklet_struct ext_tasklet; - spinlock_t phy_lock; + struct work_struct phy_work; + struct mutex phy_mutex; }; enum {