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

Commit dddf8f9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents 911656f8 6192b54b

net/core/dev.c

+1 −2
Original line number Diff line number Diff line
@@ -901,8 +901,7 @@ int dev_close(struct net_device *dev) 
	smp_mb__after_clear_bit(); /* Commit netif_running(). */

	while (test_bit(__LINK_STATE_RX_SCHED, &dev->state)) {

		/* No hurry. */

		current->state = TASK_INTERRUPTIBLE;

		schedule_timeout(1);

		msleep(1);

	}



	/*