netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: frank.blaschka@de.ibm.com
To: jgarzik@pobox.com
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
	bunk@kernel.org, kaber@trash.net
Subject: [patch 1/1] qeth: fix 2.6.27 build
Date: Mon, 21 Jul 2008 13:54:29 +0200	[thread overview]
Message-ID: <20080721115507.647845000@de.ibm.com> (raw)
In-Reply-To: 20080721115428.005485000@de.ibm.com

[-- Attachment #1: qeth_fix_build.patch --]
[-- Type: text/plain, Size: 852 bytes --]

From: Frank Blaschka <frank.blaschka@de.ibm.com>

Remove obsolete setting of the VLAN magic. This will fix the build
error introduced by Commit 6aa895b047720f71ec4eb11452f7c3ce8426941f
(vlan: Don't store VLAN tag in cb)

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
---
 drivers/s390/net/qeth_l3_main.c |    1 -
 1 file changed, 1 deletion(-)

Index: git_linus/drivers/s390/net/qeth_l3_main.c
===================================================================
--- git_linus.orig/drivers/s390/net/qeth_l3_main.c	2008-07-21 13:35:25.000000000 +0200
+++ git_linus/drivers/s390/net/qeth_l3_main.c	2008-07-21 13:37:12.000000000 +0200
@@ -2651,7 +2651,6 @@
 			tag = (u16 *)(new_skb->data + 12);
 			*tag = __constant_htons(ETH_P_8021Q);
 			*(tag + 1) = htons(vlan_tx_tag_get(new_skb));
-			VLAN_TX_SKB_CB(new_skb)->magic = 0;
 		}
 	}
 

-- 

  reply	other threads:[~2008-07-21 11:56 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-21 11:54 [patch 0/1] s390: qeth build fix for 2.6.27 frank.blaschka
2008-07-21 11:54 ` frank.blaschka [this message]
2008-07-21 12:48   ` [patch 1/1] qeth: fix 2.6.27 build Patrick McHardy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080721115507.647845000@de.ibm.com \
    --to=frank.blaschka@de.ibm.com \
    --cc=bunk@kernel.org \
    --cc=jgarzik@pobox.com \
    --cc=kaber@trash.net \
    --cc=linux-s390@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).