Re: + git-net-fix-qeth_main.patch added to -mm tree

Re: + git-net-fix-qeth_main.patch added to -mm tree

[David Miller]

From: akpm@linux-foundation.org
Date: Thu, 11 Oct 2007 02:03:27 -0700

> Subject: git-net: fix qeth_main.c
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> drivers/s390/net/qeth_main.c: In function 'qeth_hard_header_parse':
> drivers/s390/net/qeth_main.c:6584: error: 'dev' undeclared (first use in this function)
> drivers/s390/net/qeth_main.c:6584: error: (Each undeclared identifier is reported only once
> drivers/s390/net/qeth_main.c:6584: error: for each function it appears in.)
> 
> "David S. Miller" <davem@davemloft.net>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Sorry :(  This is like the 7th or 8th build failure introduced
by Stephen's headerops patch.

Applied, thanks Andrew.

[PATCH net-2.6.24] remove bogus qeth type check

[Stephen Hemminger]

Not sure why this crept in with hard-header-ops change.
Just kill it. Need to start doing cross-compiles for s390...

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

--- a/drivers/s390/net/qeth_main.c	2007-10-10 08:26:48.000000000 -0700
+++ b/drivers/s390/net/qeth_main.c	2007-10-11 13:21:17.000000000 -0700
@@ -6581,9 +6581,6 @@ qeth_hard_header_parse(const struct sk_b
 	const struct qeth_card *card;
 	const struct ethhdr *eth;
 
-	if (dev->type != ARPHRD_IEEE802_TR)
-		return 0;
-
 	card = qeth_get_card_from_dev(skb->dev);
 	if (card->options.layer2)
 		goto haveheader;


-- 
Stephen Hemminger <shemminger@linux-foundation.org>

Re: [PATCH net-2.6.24] remove bogus qeth type check

[David Miller]

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 11 Oct 2007 13:24:58 -0700

> Not sure why this crept in with hard-header-ops change.
> Just kill it. Need to start doing cross-compiles for s390...
> 
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>

I commited Andrews's fix for this more than 12 hours before you
posted this.

Re: [PATCH net-2.6.24] remove bogus qeth type check

[David Miller]

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 11 Oct 2007 13:24:58 -0700

[ SOrry, I just noticed this was different... ]

> Not sure why this crept in with hard-header-ops change.
> Just kill it. Need to start doing cross-compiles for s390...
> 
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
> 
> --- a/drivers/s390/net/qeth_main.c	2007-10-10 08:26:48.000000000 -0700
> +++ b/drivers/s390/net/qeth_main.c	2007-10-11 13:21:17.000000000 -0700
> @@ -6581,9 +6581,6 @@ qeth_hard_header_parse(const struct sk_b
>  	const struct qeth_card *card;
>  	const struct ethhdr *eth;
>  
> -	if (dev->type != ARPHRD_IEEE802_TR)
> -		return 0;
> -
>  	card = qeth_get_card_from_dev(skb->dev);
>  	if (card->options.layer2)
>  		goto haveheader;

I think you copied the check from another part of the driver.
Perhaps you should double check before we kill this outright.

Re: [PATCH net-2.6.24] remove bogus qeth type check

[David Miller]

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 11 Oct 2007 13:24:58 -0700

> Not sure why this crept in with hard-header-ops change.
> Just kill it. Need to start doing cross-compiles for s390...
> 
> Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
> 
> --- a/drivers/s390/net/qeth_main.c	2007-10-10 08:26:48.000000000 -0700
> +++ b/drivers/s390/net/qeth_main.c	2007-10-11 13:21:17.000000000 -0700
> @@ -6581,9 +6581,6 @@ qeth_hard_header_parse(const struct sk_b
>  	const struct qeth_card *card;
>  	const struct ethhdr *eth;
>  
> -	if (dev->type != ARPHRD_IEEE802_TR)
> -		return 0;
> -
>  	card = qeth_get_card_from_dev(skb->dev);
>  	if (card->options.layer2)
>  		goto haveheader;

Stephen this change is not right.

In order to preserve the semantics that existed before your
headerops changes, this test must be there.  From the original
qeth_main.c code:

	if (qeth_get_netdev_flags(card) & IFF_NOARP) {
		dev->rebuild_header = NULL;
		dev->hard_header = NULL;
		dev->header_cache_update = NULL;
		dev->hard_header_cache = NULL;
	}
 ...
	if (card->options.fake_ll &&
		(qeth_get_netdev_flags(card) & IFF_NOARP))
			dev->hard_header = qeth_fake_header;
	if (dev->type == ARPHRD_IEEE802_TR)
		dev->hard_header_parse = NULL;
	else
		dev->hard_header_parse = qeth_hard_header_parse;

With the way you set up headerops in the driver, the only way
to preserve the ARPHRD_IEEE802_TR guard, is to keep the
test that you added to qeth_hard_header_parse().

Andrew, please go back to using the first patch you wrote to
fix the build, alternative resync with net-2.6.git as that
version of the build fix is there too.

Thans.

Re: [PATCH net-2.6.24] remove bogus qeth type check

[Stephen Hemminger]

On Thu, 11 Oct 2007 17:24:54 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: Stephen Hemminger <shemminger@linux-foundation.org>
> Date: Thu, 11 Oct 2007 13:24:58 -0700
> 
> > Not sure why this crept in with hard-header-ops change.
> > Just kill it. Need to start doing cross-compiles for s390...
> > 
> > Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
> > 
> > --- a/drivers/s390/net/qeth_main.c	2007-10-10 08:26:48.000000000 -0700
> > +++ b/drivers/s390/net/qeth_main.c	2007-10-11 13:21:17.000000000 -0700
> > @@ -6581,9 +6581,6 @@ qeth_hard_header_parse(const struct sk_b
> >  	const struct qeth_card *card;
> >  	const struct ethhdr *eth;
> >  
> > -	if (dev->type != ARPHRD_IEEE802_TR)
> > -		return 0;
> > -
> >  	card = qeth_get_card_from_dev(skb->dev);
> >  	if (card->options.layer2)
> >  		goto haveheader;
> 
> Stephen this change is not right.
> 
> In order to preserve the semantics that existed before your
> headerops changes, this test must be there.  From the original
> qeth_main.c code:
> 
> 	if (qeth_get_netdev_flags(card) & IFF_NOARP) {
> 		dev->rebuild_header = NULL;
> 		dev->hard_header = NULL;
> 		dev->header_cache_update = NULL;
> 		dev->hard_header_cache = NULL;
> 	}
>  ...
> 	if (card->options.fake_ll &&
> 		(qeth_get_netdev_flags(card) & IFF_NOARP))
> 			dev->hard_header = qeth_fake_header;
> 	if (dev->type == ARPHRD_IEEE802_TR)
> 		dev->hard_header_parse = NULL;
> 	else
> 		dev->hard_header_parse = qeth_hard_header_parse;
> 
> With the way you set up headerops in the driver, the only way
> to preserve the ARPHRD_IEEE802_TR guard, is to keep the
> test that you added to qeth_hard_header_parse().
> 
> Andrew, please go back to using the first patch you wrote to
> fix the build, alternative resync with net-2.6.git as that
> version of the build fix is there too.

Dave, you right, that is why I put that test in. Should have kept
the staging tree and notes around longer.

-- 
Stephen Hemminger <shemminger@linux-foundation.org>

Re: [PATCH net-2.6.24] remove bogus qeth type check

[David Miller]

From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 11 Oct 2007 17:52:24 -0700

> On Thu, 11 Oct 2007 17:24:54 -0700 (PDT)
> David Miller <davem@davemloft.net> wrote:
> 
> > With the way you set up headerops in the driver, the only way
> > to preserve the ARPHRD_IEEE802_TR guard, is to keep the
> > test that you added to qeth_hard_header_parse().
 ...
> 
> Dave, you right, that is why I put that test in. Should have kept
> the staging tree and notes around longer.

Thanks for confirming.