qeth: HiperSockets layer-3 interface drop non IPv4 or non IPv6 packets

HiperSockets infrastructure (layer-3 mode) supports only IPv4 or
IPv6 packets. Sending other packet types disturbs TCP/IP on z/VM,
which issues messages about invalid packets.
Qeth send routine will detect packet type on sending over a
HiperSockets interface (in layer-3 mode) and drop non IP packets.
The error and drop count of the interface is incremented.

Signed-off-by: Klaus D. Wacker <kdwacker@de.ibm.com>
Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 778ddfb990777f91c8b713517f58b3e21355bceb..b41a53816e92234a3ac9757834b7a70066fb97b1 100644 (file)
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -4719,8 +4719,8 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                         elements_needed, ctx);
        else {
-               if ((skb->protocol == htons(ETH_P_ARP)) &&
-                   (card->dev->flags & IFF_NOARP)) {
+               if ((!card->options.layer2) &&
+                   (ipv == 0)) {
                        __qeth_free_new_skb(skb, new_skb);
                        return -EPERM;
                }