s390/qeth: reduce RX skb setup

Newly-allocated skbs default to PACKET_HOST, and eth_type_trans() is
smart enough to determine any other packet type from the frame's
destination address.
So except for the IQD sniffer case, there is no need to set up
skb->pkt_type manually.

Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 95bf452fc51b6969a31c005d015d1441f3328a16..09768677222b2bf61180e8107cad0798de8ec737 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -439,7 +439,6 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card,
                }
                switch (hdr->hdr.l2.id) {
                case QETH_HEADER_TYPE_LAYER2:
-                       skb->pkt_type = PACKET_HOST;
                        skb->protocol = eth_type_trans(skb, skb->dev);
                        if ((card->dev->features & NETIF_F_RXCSUM)
                           && ((hdr->hdr.l2.flags[1] &

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 283cbdcc5d6b39e77e8f6c1533e1edb5a4b552bf..c302274bab222df0a564fb69c411cfa4ff4c5e14 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1502,23 +1502,17 @@ static void qeth_l3_rebuild_skb(struct qeth_card *card, struct sk_buff *skb,
                                ipv6_eth_mc_map(&ipv6_hdr(skb)->daddr, tg_addr);
 
                        card->stats.multicast++;
-                       skb->pkt_type = PACKET_MULTICAST;
                        break;
                case QETH_CAST_BROADCAST:
                        ether_addr_copy(tg_addr, card->dev->broadcast);
                        card->stats.multicast++;
-                       skb->pkt_type = PACKET_BROADCAST;
                        break;
-               case QETH_CAST_UNICAST:
-               case QETH_CAST_ANYCAST:
-               case QETH_CAST_NOCAST:
                default:
                        if (card->options.sniffer)
                                skb->pkt_type = PACKET_OTHERHOST;
-                       else
-                               skb->pkt_type = PACKET_HOST;
                        ether_addr_copy(tg_addr, card->dev->dev_addr);
                }
+
                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.next_hop.rx.src_mac,
@@ -1578,7 +1572,6 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
                        if ((card->info.type == QETH_CARD_TYPE_IQD) &&
                            (magic == ETH_P_AF_IUCV)) {
                                skb->protocol = cpu_to_be16(ETH_P_AF_IUCV);
-                               skb->pkt_type = PACKET_HOST;
                                len = skb->len;
                                card->dev->header_ops->create(skb, card->dev, 0,
                                        card->dev->dev_addr, "FAKELL", len);
@@ -1591,7 +1584,6 @@ static int qeth_l3_process_inbound_buffer(struct qeth_card *card,
                        }
                        break;
                case QETH_HEADER_TYPE_LAYER2: /* for HiperSockets sniffer */
-                       skb->pkt_type = PACKET_HOST;
                        skb->protocol = eth_type_trans(skb, skb->dev);
                        len = skb->len;
                        netif_receive_skb(skb);