Re: [NET]: Fix dev_queue_xmit build with older gcc.

[Jeff Garzik]

Linux Kernel Mailing List wrote:
> ChangeSet 1.1822, 2004/06/21 09:32:44-07:00, akm@xxxxxxxx
>
> 	[NET]: Fix dev_queue_xmit build with older gcc.
> 	
> 	Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
> 	Signed-off-by: David S. Miller <davem@xxxxxxxxxx>
>
>
>
>  dev.c |    7 +++----
>  1 files changed, 3 insertions(+), 4 deletions(-)
>
>
> diff -Nru a/net/core/dev.c b/net/core/dev.c
> --- a/net/core/dev.c	2004-06-22 11:16:18 -07:00
> +++ b/net/core/dev.c	2004-06-22 11:16:18 -07:00
> @@ -1406,13 +1406,12 @@
>  	   Either shot noqueue qdisc, it is even simpler 8)
>  	 */
>  	if (dev->flags & IFF_UP) {
> -		preempt_disable();
> -		int cpu = smp_processor_id();
> +		int cpu = get_cpu();
>  
>  		if (dev->xmit_lock_owner != cpu) {
>  
>  			HARD_TX_LOCK_BH(dev, cpu);
> -			preempt_enable();
> +			put_cpu();
>  
>  			if (!netif_queue_stopped(dev)) {
>  				if (netdev_nit)
> @@ -1430,7 +1429,7 @@
>  				       "queue packet!\n", dev->name);
>  			goto out_enetdown;
>  		} else {
> -			preempt_enable();
> +			put_cpu();


Has this been tested with preempt?

It looks right, but I'm paranoid...

	Jeff


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/