diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-09 22:30:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-09 22:30:23 +0300 |
| commit | 7b30d51a8f830bd1c1103d31d0314ea6f1106707 (patch) | |
| tree | 577be160ca8f5a410d2d10eeb911c0c7286eb36a /drivers/s390/net/qeth_core.h | |
| parent | 0bf7800f1799b5b1fd7d4f024e9ece53ac489011 (diff) | |
| parent | 1c5b2216fbb973a9410e0b06389740b5c1289171 (diff) | |
| download | linux-7b30d51a8f830bd1c1103d31d0314ea6f1106707.tar.xz | |
Merge branch 's390-qeth-fixes'
Julian Wiedmann says:
====================
s390/qeth: fixes 2018-02-09
please apply the following two qeth patches for 4.16 and stable.
One restricts a command quirk to the intended commandd type,
while the other fixes an off-by-one during data transmission
that can cause qeth to build malformed buffer descriptors.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net/qeth_core.h')
| -rw-r--r-- | drivers/s390/net/qeth_core.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index db42107bf2f5..959c65cf75d9 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h @@ -591,6 +591,11 @@ struct qeth_cmd_buffer { void (*callback) (struct qeth_channel *, struct qeth_cmd_buffer *); }; +static inline struct qeth_ipa_cmd *__ipa_cmd(struct qeth_cmd_buffer *iob) +{ + return (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE); +} + /** * definition of a qeth channel, used for read and write */ @@ -846,7 +851,7 @@ struct qeth_trap_id { */ static inline int qeth_get_elements_for_range(addr_t start, addr_t end) { - return PFN_UP(end - 1) - PFN_DOWN(start); + return PFN_UP(end) - PFN_DOWN(start); } static inline int qeth_get_micros(void) |