aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/qeth_l2_main.c
diff options
context:
space:
mode:
authorFrank Blaschka <frank.blaschka@de.ibm.com>2008-04-24 04:15:24 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-29 01:56:32 -0400
commitf90b744eb8ead0af7a7aa2f78ff861dff4863f2c (patch)
treed5901d8dbdcb6c3af05a28d00bbc43f961629093 /drivers/s390/net/qeth_l2_main.c
parent3f9975aa4d5b3c614eef8785ec63da13fbd55b51 (diff)
qeth: rework fast path
Remove unnecessary traces. Remove unnecessary wrappers for skb functions. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/s390/net/qeth_l2_main.c')
-rw-r--r--drivers/s390/net/qeth_l2_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index e6092829a5a9..ef07e9cadfc1 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -632,8 +632,6 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
632 enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO; 632 enum qeth_large_send_types large_send = QETH_LARGE_SEND_NO;
633 struct qeth_eddp_context *ctx = NULL; 633 struct qeth_eddp_context *ctx = NULL;
634 634
635 QETH_DBF_TEXT(TRACE, 6, "l2xmit");
636
637 if ((card->state != CARD_STATE_UP) || !card->lan_online) { 635 if ((card->state != CARD_STATE_UP) || !card->lan_online) {
638 card->stats.tx_carrier_errors++; 636 card->stats.tx_carrier_errors++;
639 goto tx_drop; 637 goto tx_drop;
@@ -655,9 +653,12 @@ static int qeth_l2_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
655 if (card->info.type == QETH_CARD_TYPE_OSN) 653 if (card->info.type == QETH_CARD_TYPE_OSN)
656 hdr = (struct qeth_hdr *)skb->data; 654 hdr = (struct qeth_hdr *)skb->data;
657 else { 655 else {
658 new_skb = qeth_prepare_skb(card, skb, &hdr); 656 /* create a clone with writeable headroom */
657 new_skb = skb_realloc_headroom(skb, sizeof(struct qeth_hdr));
659 if (!new_skb) 658 if (!new_skb)
660 goto tx_drop; 659 goto tx_drop;
660 hdr = (struct qeth_hdr *)skb_push(new_skb,
661 sizeof(struct qeth_hdr));
661 qeth_l2_fill_header(card, hdr, new_skb, ipv, cast_type); 662 qeth_l2_fill_header(card, hdr, new_skb, ipv, cast_type);
662 } 663 }
663 664
@@ -744,7 +745,6 @@ static void qeth_l2_qdio_input_handler(struct ccw_device *ccwdev,
744 int index; 745 int index;
745 int i; 746 int i;
746 747
747 QETH_DBF_TEXT(TRACE, 6, "qdinput");
748 card = (struct qeth_card *) card_ptr; 748 card = (struct qeth_card *) card_ptr;
749 net_dev = card->dev; 749 net_dev = card->dev;
750 if (card->options.performance_stats) { 750 if (card->options.performance_stats) {