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

Commit cf42553a authored by Andrew Victor's avatar Andrew Victor Committed by Jeff Garzik
Browse files

[PATCH] AT91RM9200 Ethernet: Move check_timer variable and use mod_timer() 



Move the global 'check_timer' variable into the private data structure.
Also now use mod_timer().

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c57ee096

drivers/net/arm/at91_ether.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ 
#define DRV_NAME	"at91_ether"

#define DRV_NAME	"at91_ether"

#define DRV_VERSION	"1.0"

#define DRV_VERSION	"1.0"





static struct timer_list check_timer;

#define LINK_POLL_INTERVAL	(HZ)

#define LINK_POLL_INTERVAL	(HZ)





/* ..................................................................... */

/* ..................................................................... */
@@ -250,8 +249,7 @@ static void enable_phyirq(struct net_device *dev) 
		 * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),

		 * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),

		 * or board does not have it connected.

		 * or board does not have it connected.

		 */

		 */

		check_timer.expires = jiffies + LINK_POLL_INTERVAL;

		mod_timer(&lp->check_timer, jiffies + LINK_POLL_INTERVAL);

		add_timer(&check_timer);

		return;

		return;

	}

	}
@@ -298,7 +296,7 @@ static void disable_phyirq(struct net_device *dev) 




	irq_number = lp->board_data.phy_irq_pin;

	irq_number = lp->board_data.phy_irq_pin;

	if (!irq_number) {

	if (!irq_number) {

		del_timer_sync(&check_timer);

		del_timer_sync(&lp->check_timer);

		return;

		return;

	}

	}
@@ -360,13 +358,13 @@ static void reset_phy(struct net_device *dev) 
static void at91ether_check_link(unsigned long dev_id)

static void at91ether_check_link(unsigned long dev_id)

{

{

	struct net_device *dev = (struct net_device *) dev_id;

	struct net_device *dev = (struct net_device *) dev_id;

	struct at91_private *lp = netdev_priv(dev);





	enable_mdi();

	enable_mdi();

	update_linkspeed(dev, 1);

	update_linkspeed(dev, 1);

	disable_mdi();

	disable_mdi();





	check_timer.expires = jiffies + LINK_POLL_INTERVAL;

	mod_timer(&lp->check_timer, jiffies + LINK_POLL_INTERVAL);

	add_timer(&check_timer);

}

}





/* ......................... ADDRESS MANAGEMENT ........................ */

/* ......................... ADDRESS MANAGEMENT ........................ */
@@ -1030,9 +1028,9 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add 




	/* If board has no PHY IRQ, use a timer to poll the PHY */

	/* If board has no PHY IRQ, use a timer to poll the PHY */

	if (!lp->board_data.phy_irq_pin) {

	if (!lp->board_data.phy_irq_pin) {

		init_timer(&check_timer);

		init_timer(&lp->check_timer);

		check_timer.data = (unsigned long)dev;

		lp->check_timer.data = (unsigned long)dev;

		check_timer.function = at91ether_check_link;

		lp->check_timer.function = at91ether_check_link;

	}

	}





	/* Display ethernet banner */

	/* Display ethernet banner */

drivers/net/arm/at91_ether.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ struct at91_private 
	spinlock_t lock;			/* lock for MDI interface */

	spinlock_t lock;			/* lock for MDI interface */

	short phy_media;			/* media interface type */

	short phy_media;			/* media interface type */

	unsigned short phy_address;		/* 5-bit MDI address of PHY (0..31) */

	unsigned short phy_address;		/* 5-bit MDI address of PHY (0..31) */

	struct timer_list check_timer;		/* Poll link status */





	/* Transmit */

	/* Transmit */

	struct sk_buff *skb;			/* holds skb until xmit interrupt completes */

	struct sk_buff *skb;			/* holds skb until xmit interrupt completes */