diff options
Diffstat (limited to 'drivers/s390/net/qeth_main.c')
-rw-r--r-- | drivers/s390/net/qeth_main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 617fbfd767fa..f3e6fbeb2123 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -2505,7 +2505,7 @@ qeth_rebuild_skb_fake_ll_tr(struct qeth_card *card, struct sk_buff *skb, | |||
2505 | struct iphdr *ip_hdr; | 2505 | struct iphdr *ip_hdr; |
2506 | 2506 | ||
2507 | QETH_DBF_TEXT(trace,5,"skbfktr"); | 2507 | QETH_DBF_TEXT(trace,5,"skbfktr"); |
2508 | skb_set_mac_header(skb, -QETH_FAKE_LL_LEN_TR); | 2508 | skb_set_mac_header(skb, (int)-QETH_FAKE_LL_LEN_TR); |
2509 | /* this is a fake ethernet header */ | 2509 | /* this is a fake ethernet header */ |
2510 | fake_hdr = tr_hdr(skb); | 2510 | fake_hdr = tr_hdr(skb); |
2511 | 2511 | ||
@@ -4710,9 +4710,15 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb) | |||
4710 | if (card->info.type != QETH_CARD_TYPE_IQD) | 4710 | if (card->info.type != QETH_CARD_TYPE_IQD) |
4711 | rc = qeth_do_send_packet(card, queue, new_skb, hdr, | 4711 | rc = qeth_do_send_packet(card, queue, new_skb, hdr, |
4712 | elements_needed, ctx); | 4712 | elements_needed, ctx); |
4713 | else | 4713 | else { |
4714 | if ((skb->protocol == htons(ETH_P_ARP)) && | ||
4715 | (card->dev->flags & IFF_NOARP)) { | ||
4716 | __qeth_free_new_skb(skb, new_skb); | ||
4717 | return -EPERM; | ||
4718 | } | ||
4714 | rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr, | 4719 | rc = qeth_do_send_packet_fast(card, queue, new_skb, hdr, |
4715 | elements_needed, ctx); | 4720 | elements_needed, ctx); |
4721 | } | ||
4716 | if (!rc) { | 4722 | if (!rc) { |
4717 | card->stats.tx_packets++; | 4723 | card->stats.tx_packets++; |
4718 | card->stats.tx_bytes += tx_bytes; | 4724 | card->stats.tx_bytes += tx_bytes; |