[PATCH] Merge GT/MV642xx Support into MV643xx Driver [5/8]

[PATCH] Merge GT/MV642xx Support into MV643xx Driver [5/8]

[Steven J. Hill]

[-- Attachment #1.1: Type: text/plain, Size: 123 bytes --]

Fix 'mv643xx_eth_tx_timeout_task' function prototype.

Signed-off-by: Steven J. Hill <sjhill1@rockwellcollins.com>
---

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 05-mv643xx-fix-function-prototype.patch --]
[-- Type: text/x-patch; name="05-mv643xx-fix-function-prototype.patch", Size: 662 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 254 bytes --]

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

[Christoph Hellwig]

On Wed, Jul 18, 2007 at 11:54:45PM -0500, Steven J. Hill wrote:
> Fix 'mv643xx_eth_tx_timeout_task' function prototype.

Patches 5-7 look like valid fixes independent of the merge.  Please send
them out inlined in the mail and with proper subjects so they can be
merged independent of the GT/MV642xx support.

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

[Dale Farnsworth]

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@rockwellcollins.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