Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ef45b0 authored by Shani's avatar Shani Committed by Jeff Garzik
Browse files

Patch:replace with time_after in drivers/net/eexpress.c 



Replacing with time_after in drivers/net/eexpress.c
Applies and compiles clean on latest tree.Not tested.

Signed-off-by: default avatarShani Moideen <shani.moideen@wipro.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent acbddb59

drivers/net/eexpress.c

+4 −3
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
#include <linux/mca-legacy.h>

#include <linux/spinlock.h>

#include <linux/bitops.h>

#include <linux/jiffies.h>



#include <asm/system.h>

#include <asm/io.h>
@@ -556,7 +557,7 @@ static void unstick_cu(struct net_device *dev) 


	if (lp->started)

	{

		if ((jiffies - dev->trans_start)>50)

		if (time_after(jiffies, dev->trans_start + 50))

		{

			if (lp->tx_link==lp->last_tx_restart)

			{
@@ -612,7 +613,7 @@ static void unstick_cu(struct net_device *dev) 
	}

	else

	{

		if ((jiffies-lp->init_time)>10)

		if (time_after(jiffies, lp->init_time + 10))

		{

			unsigned short status = scb_status(dev);

			printk(KERN_WARNING "%s: i82586 startup timed out, status %04x, resetting...\n",
@@ -1649,7 +1650,7 @@ eexp_set_multicast(struct net_device *dev) 
#endif

                oj = jiffies;

                while ((SCB_CUstat(scb_status(dev)) == 2) &&

                       ((jiffies-oj) < 2000));

                       (time_after(jiffies, oj + 2000)));

		if (SCB_CUstat(scb_status(dev)) == 2)

			printk("%s: warning, CU didn't stop\n", dev->name);

                lp->started &= ~(STARTED_CU);