Patchwork linux-next: ibmveth runtime errors

login
register
mail settings
Submitter Stephen Rothwell
Date April 28, 2011, 2:11 a.m.
Message ID <20110428121124.39c036ff.sfr@canb.auug.org.au>
Download mbox | patch
Permalink /patch/93167/
State Not Applicable
Headers show

Comments

Stephen Rothwell - April 28, 2011, 2:11 a.m.
Hi Michał,

On Wed, 27 Apr 2011 12:36:22 +0200 Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
>
> Please test the following patch. It's just a blind guess, as this error
> is not descriptive.
> 
> Best Regards,
> Michał Mirosław
> 
> ---
> 
> net: ibmveth: force reconfiguring checksum settings on startup
> 
> Commit b9367bf3ee6d ("net: ibmveth: convert to hw_features") accidentally
> removed call to ibmveth_set_csum_offload() in ibmveth_probe(). Put the
> call back where it was, but with additional error checking provided
> by ibmveth_set_features().
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> ---
>  drivers/net/ibmveth.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
> index 4855f1f..0d1fea2 100644
> --- a/drivers/net/ibmveth.c
> +++ b/drivers/net/ibmveth.c
> @@ -1397,6 +1397,8 @@ static int __devinit ibmveth_probe(struct vio_dev *dev,
>  
>  	netdev_dbg(netdev, "registering netdev...\n");
>  
> +	ibmveth_set_features(dev, dev->features);
> +
>  	rc = register_netdev(netdev);
>  
>  	if (rc) {

This worked after I changed both "dev"s to "netdev".  And the boot
succedded.  I will apply this patchg to linux-next today and hopefully
Dave can apply it to the net tree.  I have added a copy fo the patch I
used below.

From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>
Date: Thu, 28 Apr 2011 11:59:15 +1000
Subject: [PATCH] net: ibmveth: force reconfiguring checksum settings on
 startup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit b9367bf3ee6d ("net: ibmveth: convert to hw_features") accidentally
removed call to ibmveth_set_csum_offload() in ibmveth_probe(). Put the
call back where it was, but with additional error checking provided
by ibmveth_set_features().

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
[sfr: dev -> netdev]
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ibmveth.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
David Miller - April 28, 2011, 8:46 p.m.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Apr 2011 12:11:24 +1000

> From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>
> Date: Thu, 28 Apr 2011 11:59:15 +1000
> Subject: [PATCH] net: ibmveth: force reconfiguring checksum settings on
>  startup
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> Commit b9367bf3ee6d ("net: ibmveth: convert to hw_features") accidentally
> removed call to ibmveth_set_csum_offload() in ibmveth_probe(). Put the
> call back where it was, but with additional error checking provided
> by ibmveth_set_features().
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> [sfr: dev -> netdev]
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks everyone.

Patch

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 4855f1f..be3fe71 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1397,6 +1397,8 @@  static int __devinit ibmveth_probe(struct vio_dev *dev,
 
 	netdev_dbg(netdev, "registering netdev...\n");
 
+	ibmveth_set_features(netdev, netdev->features);
+
 	rc = register_netdev(netdev);
 
 	if (rc) {