[PATCH 1/5] s390: qeth driver fixes

[PATCH 1/5] s390: qeth driver fixes

[Frank Pavlic]

Hi ,

please apply following 5 patches for s390 network device drivers.
Sorry for the fifth patch containing some lines which just remove
whitespaces. Another patch will follow in the next couple of days
with more whitespace and coding style cleanups in drivers/s390/net.

Thank you 

Frank

[PATCH 1/5] s390: qeth driver fixes

From: Frank Blaschka <Frank.Blaschka@de.ibm.com>
From: Ursula Braun <braunu@de.ibm.com>
        - VLAN header reordering did not work on packets
          received through qeth interface in layer 2 mode.
          This caused dhcpcd not to work with VLAN devices.
	- set qeth performance statistics initally inactive

Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
---
 drivers/s390/net/qeth_main.c |   21 +++------------------
 1 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 2bde4f1..67062d5 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -1074,7 +1074,7 @@ #endif /* QETH_IPV6 */
 		card->options.layer2 = 1;
 	else
 		card->options.layer2 = 0;
-	card->options.performance_stats = 1;
+	card->options.performance_stats = 0;
 }
 
 /**
@@ -2466,32 +2466,17 @@ qeth_rebuild_skb_fake_ll(struct qeth_car
 		qeth_rebuild_skb_fake_ll_eth(card, skb, hdr);
 }
 
-static inline __u16
+static inline void
 qeth_layer2_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
 			struct qeth_hdr *hdr)
 {
-	unsigned short vlan_id = 0;
-#ifdef CONFIG_QETH_VLAN
-	struct vlan_hdr *vhdr;
-#endif
-
 	skb->pkt_type = PACKET_HOST;
 	skb->protocol = qeth_type_trans(skb, skb->dev);
 	if (card->options.checksum_type == NO_CHECKSUMMING)
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 	else
 		skb->ip_summed = CHECKSUM_NONE;
-#ifdef CONFIG_QETH_VLAN
-	if (hdr->hdr.l2.flags[2] & (QETH_LAYER2_FLAG_VLAN)) {
-		vhdr = (struct vlan_hdr *) skb->data;
-		skb->protocol =
-			__constant_htons(vhdr->h_vlan_encapsulated_proto);
-		vlan_id = hdr->hdr.l2.vlan_id;
-		skb_pull(skb, VLAN_HLEN);
-	}
-#endif
 	*((__u32 *)skb->cb) = ++card->seqno.pkt_seqno;
-	return vlan_id;
 }
 
 static inline __u16
@@ -2571,7 +2556,7 @@ qeth_process_inbound_buffer(struct qeth_
 				       &offset, &hdr))) {
 		skb->dev = card->dev;
 		if (hdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2)
-			vlan_tag = qeth_layer2_rebuild_skb(card, skb, hdr);
+			qeth_layer2_rebuild_skb(card, skb, hdr);
 		else if (hdr->hdr.l3.id == QETH_HEADER_TYPE_LAYER3)
 			vlan_tag = qeth_rebuild_skb(card, skb, hdr);
 		else { /*in case of OSN*/
-- 
1.4.2.3

Re: [PATCH 1/5] s390: qeth driver fixes

[Jeff Garzik]

Frank Pavlic wrote:
> Hi ,
> 
> please apply following 5 patches for s390 network device drivers.
> Sorry for the fifth patch containing some lines which just remove
> whitespaces. Another patch will follow in the next couple of days
> with more whitespace and coding style cleanups in drivers/s390/net.
> 
> Thank you 
> 
> Frank
> 
> [PATCH 1/5] s390: qeth driver fixes
> 
> From: Frank Blaschka <Frank.Blaschka@de.ibm.com>
> From: Ursula Braun <braunu@de.ibm.com>
>         - VLAN header reordering did not work on packets
>           received through qeth interface in layer 2 mode.
>           This caused dhcpcd not to work with VLAN devices.
> 	- set qeth performance statistics initally inactive
> 
> Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>

applied patches 1-4 of 5.  patch #5 failed to apply, and also, it's not 
really appropriate for the current release candidate bugfix window.

Also:

1) Please include notes to me and reviewers following the "---" marker. 
  Everything before the "---" is copied /verbatim/ into the kernel 
changelog.  Everything after "---", except the patch itself, is ignored.

I had to hand-edit each of your patches, to remove the "Hi , ... Frank" 
paragraph and the "[PATCH 1/5] S390: ..." from the body of each email.

2) Your subject line should be more descriptive.  The subject line is 
used to generate a one-line summary.  You can see how your subject lines 
are vague:

	[PATCH] s390: qeth driver fixes
	[PATCH] s390: qeth driver fixes
	[PATCH] s390: qeth driver fixes

Here, I had to hand-edit each email subject line to be more descriptive.

3) In general, review Documentation/SubmittingPatches and 
http://linux.yyz.us/patch-format.html

	Jeff

Re: [PATCH 1/5] s390: qeth driver fixes

[Frank Pavlic]

Sorry for the trouble and also thank you very much
for having done the extra work. I made the patches
using git-format-patch so seems that I have to review
them more carefully or I still haven't understand to use
git-format-patch properly. 
In any case I will read the documents you mentioned 
once again to keep such points in mind...


Frank

On Tue, Jan 09, 2007 at 02:23:23AM -0500, Jeff Garzik wrote:
> Frank Pavlic wrote:
> >Hi ,
> >
> >please apply following 5 patches for s390 network device drivers.
> >Sorry for the fifth patch containing some lines which just remove
> >whitespaces. Another patch will follow in the next couple of days
> >with more whitespace and coding style cleanups in drivers/s390/net.
> >
> >Thank you
> >
> >Frank
> >
> >[PATCH 1/5] s390: qeth driver fixes
> >
> >From: Frank Blaschka <Frank.Blaschka@de.ibm.com>
> >From: Ursula Braun <braunu@de.ibm.com>
> >        - VLAN header reordering did not work on packets
> >          received through qeth interface in layer 2 mode.
> >          This caused dhcpcd not to work with VLAN devices.
> >	- set qeth performance statistics initally inactive
> >
> >Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
> 
> applied patches 1-4 of 5.  patch #5 failed to apply, and also, it's not
> really appropriate for the current release candidate bugfix window.
> 
> Also:
> 
> 1) Please include notes to me and reviewers following the "---" marker.
>  Everything before the "---" is copied /verbatim/ into the kernel
> changelog.  Everything after "---", except the patch itself, is ignored.
> 
> I had to hand-edit each of your patches, to remove the "Hi , ... Frank"
> paragraph and the "[PATCH 1/5] S390: ..." from the body of each email.
> 
> 2) Your subject line should be more descriptive.  The subject line is
> used to generate a one-line summary.  You can see how your subject lines
> are vague:
> 
> 	[PATCH] s390: qeth driver fixes
> 	[PATCH] s390: qeth driver fixes
> 	[PATCH] s390: qeth driver fixes
> 
> Here, I had to hand-edit each email subject line to be more descriptive.
> 
> 3) In general, review Documentation/SubmittingPatches and
> http://linux.yyz.us/patch-format.html
> 
> 	Jeff
> 
> 
> -
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] s390: qeth driver fixes

[Jeff Garzik]

Frank Pavlic wrote:
> Sorry for the trouble and also thank you very much
> for having done the extra work. I made the patches
> using git-format-patch so seems that I have to review
> them more carefully or I still haven't understand to use
> git-format-patch properly. 
> In any case I will read the documents you mentioned 
> once again to keep such points in mind...

If you are using git, maybe its as simple as checking in each patch with 
a unique first-line (== one-line summary)?

Also, if you so choose, you are welcome to submit changes directly via 
git to me, just like Martin Schwidefsky does with the main S/390 changes.

	Jeff