netdev - Re: [PATCH] Merge GT/MV642xx Support into MV643xx Driver [5/8]

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20070719141338.GD12892@xyzzy.farnsworth.org>
Date:	Thu, 19 Jul 2007 07:13:38 -0700
From:	"Dale Farnsworth" <dale@...nsworth.org>
To:	"Steven J. Hill" <sjhill@...litydiluted.com>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH] Merge GT/MV642xx Support into MV643xx Driver [5/8]

On Thu, Jul 19, 2007 at 04:54:45AM +0000, Steven J. Hill wrote:
> Fix 'mv643xx_eth_tx_timeout_task' function prototype.
> 
> Signed-off-by: Steven J. Hill <sjhill1@...kwellcollins.com>
> ---
> 
> --- linux-2.6.22.1/drivers/net/mv643xx_eth.c	2007-07-18 21:45:13.000000000 -0500
> +++ linux-2.6.22.1-rci/drivers/net/mv643xx_eth.c	2007-07-18 21:44:07.000000000 -0500
> @@ -317,11 +315,9 @@
>   *
>   * Actual routine to reset the adapter when a timeout on Tx has occurred
>   */
> -static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly)
> +static void mv643xx_eth_tx_timeout_task(struct net_device *dev)
>  {
> -	struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private,
> -						  tx_timeout_task);
> -	struct net_device *dev = mp->mii.dev; /* yuck */
> +	struct mv643xx_private *mp = netdev_priv(dev);
>  
>  	if (!netif_running(dev))
>  		return;

Applying this patch results yields a new compiler warning:
drivers/net/mv643xx_eth.c: In function `mv643xx_eth_probe':
drivers/net/mv643xx_eth.c:1375: warning: assignment from incompatible pointer type

I think we're stuck with the "struct work_struct" argument.

-Dale
-
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