From: frank.blaschka@de•ibm.com
To: jgarzik@pobox•com
Cc: netdev@vger•kernel.org, linux-s390@vger•kernel.org,
Ursula Braun <ursula.braun@de•ibm.com>
Subject: [patch 2/6] qeth: exploit source MAC address for inbound layer3 packets
Date: Fri, 02 Jan 2009 16:01:41 +0100 [thread overview]
Message-ID: <20090102150253.923245000@de.ibm.com> (raw)
In-Reply-To: 20090102150139.830998000@de.ibm.com
[-- Attachment #1: 606-qeth-source-mac.diff --]
[-- Type: text/plain, Size: 3196 bytes --]
From: Ursula Braun <ursula.braun@de•ibm.com>
OSA-devices operating in layer3 mode offer adding of the source MAC
address to the QDIO header of inbound packets. The qeth driver can
exploit this functionality to replace FAKELL-entries in the ethernet
header of received packets.
Signed-off-by: Ursula Braun <ursula.braun@de•ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de•ibm.com>
---
drivers/s390/net/qeth_core.h | 1 -
drivers/s390/net/qeth_core_main.c | 1 -
drivers/s390/net/qeth_l3_main.c | 16 +++++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff -urpN linux-2.6/drivers/s390/net/qeth_core.h linux-2.6-patched/drivers/s390/net/qeth_core.h
--- linux-2.6/drivers/s390/net/qeth_core.h 2009-01-02 10:21:51.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core.h 2009-01-02 10:22:06.000000000 +0100
@@ -643,7 +643,6 @@ struct qeth_card_options {
int macaddr_mode;
int fake_broadcast;
int add_hhlen;
- int fake_ll;
int layer2;
enum qeth_large_send_types large_send;
int performance_stats;
diff -urpN linux-2.6/drivers/s390/net/qeth_core_main.c linux-2.6-patched/drivers/s390/net/qeth_core_main.c
--- linux-2.6/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:06.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_core_main.c 2009-01-02 10:22:06.000000000 +0100
@@ -1072,7 +1072,6 @@ static void qeth_set_intial_options(stru
card->options.macaddr_mode = QETH_TR_MACADDR_NONCANONICAL;
card->options.fake_broadcast = 0;
card->options.add_hhlen = DEFAULT_ADD_HHLEN;
- card->options.fake_ll = 0;
card->options.performance_stats = 0;
card->options.rx_sg_cb = QETH_RX_SG_CB;
}
diff -urpN linux-2.6/drivers/s390/net/qeth_l3_main.c linux-2.6-patched/drivers/s390/net/qeth_l3_main.c
--- linux-2.6/drivers/s390/net/qeth_l3_main.c 2009-01-02 10:21:51.000000000 +0100
+++ linux-2.6-patched/drivers/s390/net/qeth_l3_main.c 2009-01-02 10:22:06.000000000 +0100
@@ -1207,12 +1207,9 @@ static int qeth_l3_start_ipa_source_mac(
QETH_DBF_TEXT(TRACE, 3, "stsrcmac");
- if (!card->options.fake_ll)
- return -EOPNOTSUPP;
-
if (!qeth_is_supported(card, IPA_SOURCE_MAC)) {
dev_info(&card->gdev->dev,
- "Inbound source address not supported on %s\n",
+ "Inbound source MAC-address not supported on %s\n",
QETH_CARD_IFNAME(card));
return -EOPNOTSUPP;
}
@@ -1221,7 +1218,7 @@ static int qeth_l3_start_ipa_source_mac(
IPA_CMD_ASS_START, 0);
if (rc)
dev_warn(&card->gdev->dev,
- "Starting proxy ARP support for %s failed\n",
+ "Starting source MAC-address support for %s failed\n",
QETH_CARD_IFNAME(card));
return rc;
}
@@ -1921,8 +1918,13 @@ static inline __u16 qeth_l3_rebuild_skb(
memcpy(tg_addr, card->dev->dev_addr,
card->dev->addr_len);
}
- card->dev->header_ops->create(skb, card->dev, prot, tg_addr,
- "FAKELL", card->dev->addr_len);
+ if (hdr->hdr.l3.ext_flags & QETH_HDR_EXT_SRC_MAC_ADDR)
+ card->dev->header_ops->create(skb, card->dev, prot,
+ tg_addr, &hdr->hdr.l3.dest_addr[2],
+ card->dev->addr_len);
+ else
+ card->dev->header_ops->create(skb, card->dev, prot,
+ tg_addr, "FAKELL", card->dev->addr_len);
}
#ifdef CONFIG_TR
--
next prev parent reply other threads:[~2009-01-02 15:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-02 15:01 [patch 0/6] s390: qeth fixes 2.6.29 frank.blaschka
2009-01-02 15:01 ` [patch 1/6] HiperSockets mcl string conversion (pre z9 mach) frank.blaschka
2009-01-05 1:36 ` David Miller
2009-01-02 15:01 ` frank.blaschka [this message]
2009-01-05 1:36 ` [patch 2/6] qeth: exploit source MAC address for inbound layer3 packets David Miller
2009-01-02 15:01 ` [patch 3/6] qeth: avoid crash in case of layer mismatch for VSWITCH frank.blaschka
2009-01-05 1:36 ` David Miller
2009-01-02 15:01 ` [patch 4/6] qeth: do not spin for SETIP ip assist command frank.blaschka
2009-01-05 1:37 ` David Miller
2009-01-02 15:01 ` [patch 5/6] qeth: No large send using EDDP for HiperSockets frank.blaschka
2009-01-05 1:37 ` David Miller
2009-01-02 15:01 ` [patch 6/6] qeth: get rid of extra argument after printk to dev_* conversion frank.blaschka
2009-01-05 1:37 ` David Miller
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=20090102150253.923245000@de.ibm.com \
--to=frank.blaschka@de$(echo .)ibm.com \
--cc=jgarzik@pobox$(echo .)com \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ursula.braun@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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