diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-15 00:33:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-15 00:33:23 +0100 |
| commit | 3eb66e91a25497065c5322b1268cbc3953642227 (patch) | |
| tree | 69f8e1312323ceeafc1a0fdc24d168e1617ffed4 /include/net/tipc.h | |
| parent | Input: raspberrypi-ts - fix link error (diff) | |
| parent | Linux 4.20 (diff) | |
| download | linux-3eb66e91a25497065c5322b1268cbc3953642227.tar.xz linux-3eb66e91a25497065c5322b1268cbc3953642227.zip | |
Merge tag 'v4.20' into for-linus
Sync with mainline to get linux/overflow.h among other things.
Diffstat (limited to 'include/net/tipc.h')
| -rw-r--r-- | include/net/tipc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tipc.h b/include/net/tipc.h index 07670ec022a7..f0e7e6bc1bef 100644 --- a/include/net/tipc.h +++ b/include/net/tipc.h @@ -44,11 +44,11 @@ struct tipc_basic_hdr { __be32 w[4]; }; -static inline u32 tipc_hdr_rps_key(struct tipc_basic_hdr *hdr) +static inline __be32 tipc_hdr_rps_key(struct tipc_basic_hdr *hdr) { u32 w0 = ntohl(hdr->w[0]); bool keepalive_msg = (w0 & KEEPALIVE_MSG_MASK) == KEEPALIVE_MSG_MASK; - int key; + __be32 key; /* Return source node identity as key */ if (likely(!keepalive_msg)) |