lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 5 Jan 2007 08:58:54 -0600 From: Kumar Gala <galak@...nel.crashing.org> To: Jeff Garzik <jgarzik@...ox.com> Cc: Netdev <netdev@...r.kernel.org>, Timur Tabi <timur@...escale.com> Subject: Re: [PATCH] Update ucc_geth.c for new workqueue structure Jeff, Friendly reminder that this should go in for 2.6.20 - k On Dec 18, 2006, at 10:23 AM, Kumar Gala wrote: > Jeff, > > Can you pickup this patch for 2.6.20 as it fixes a compile issue > due to the workqueue changes. > > - kumar > > On Dec 13, 2006, at 5:08 PM, timur@...escale.com wrote: > >> From: Timur Tabi <timur@...escale.com> >> >> The workqueue interface changed with David Howell's patch on >> 11/22/2006 >> (SHA 65f27f38446e1976cc98fd3004b110fedcddd189). Several drivers were >> updated with that patch to handle the new interface, but ucc_geth.c >> was not one of them. This patch updates ucc_geth.c to support the >> new >> model. >> >> A compiler warning in set_mac_addr() was also fixed. >> >> Signed-off-by: Timur Tabi <timur@...escale.com> >> Signed-off-by: Kumar Gala <galak@...nel.crashing.org> >> >> --- >> drivers/net/ucc_geth.c | 12 +++++++----- >> 1 files changed, 7 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c >> index 1f05511..d33bb0c 100644 >> --- a/drivers/net/ucc_geth.c >> +++ b/drivers/net/ucc_geth.c >> @@ -29,6 +29,7 @@ >> #include <linux/fsl_devices.h> >> #include <linux/ethtool.h> >> #include <linux/mii.h> >> +#include <linux/workqueue.h> >> >> #include <asm/of_platform.h> >> #include <asm/uaccess.h> >> @@ -472,7 +473,7 @@ static void put_enet_addr_container(stru >> kfree(enet_addr_cont); >> } >> >> -static int set_mac_addr(__be16 __iomem *reg, u8 *mac) >> +static void set_mac_addr(__be16 __iomem *reg, u8 *mac) >> { >> out_be16(®[0], ((u16)mac[5] << 8) | mac[4]); >> out_be16(®[1], ((u16)mac[3] << 8) | mac[2]); >> @@ -3918,10 +3919,11 @@ static irqreturn_t phy_interrupt(int irq >> } >> >> /* Scheduled by the phy_interrupt/timer to handle PHY changes */ >> -static void ugeth_phy_change(void *data) >> +static void ugeth_phy_change(struct work_struct *work) >> { >> - struct net_device *dev = (struct net_device *)data; >> - struct ucc_geth_private *ugeth = netdev_priv(dev); >> + struct ucc_geth_private *ugeth = >> + container_of(work, struct ucc_geth_private, tq); >> + struct net_device *dev = ugeth->dev; >> struct ucc_geth *ug_regs; >> int result = 0; >> >> @@ -4078,7 +4080,7 @@ static int ucc_geth_open(struct net_devi >> #endif /* CONFIG_UGETH_NAPI */ >> >> /* Set up the PHY change work queue */ >> - INIT_WORK(&ugeth->tq, ugeth_phy_change, dev); >> + INIT_WORK(&ugeth->tq, ugeth_phy_change); >> >> init_timer(&ugeth->phy_info_timer); >> ugeth->phy_info_timer.function = &ugeth_phy_startup_timer; >> -- >> 1.4.4 >> >> - >> To unsubscribe from this list: send the line "unsubscribe netdev" in >> the body of a message to majordomo@...r.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > - > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@...r.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists