diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-27 18:18:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-27 18:18:52 -0500 |
| commit | 721a57a02dfc81b6d63b93b8ca23be3004b61515 (patch) | |
| tree | 6d5b3bdd02fd7586b54de631f806e76efcdbfb50 /net/tipc/msg.h | |
| parent | 247f6d0f8667fda408fbe0e503ab54a957be2ce5 (diff) | |
| parent | d76a436d50d1ebce352e1815eaea79a254b2b24f (diff) | |
Merge branch 'tipc-next'
Erik Hugne says:
====================
tipc: bug fix and some improvements
Most important is a fix for a nullptr exception that would occur when
name table subscriptions fail. The remaining patches are performance
improvements and cosmetic changes.
v2: remove unnecessary whitespace in patch #2
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/msg.h')
| -rw-r--r-- | net/tipc/msg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 9ace47f44a69..c1cc8d7a5d52 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -76,7 +76,7 @@ struct plist; #define MAX_MSG_SIZE (MAX_H_SIZE + TIPC_MAX_USER_MSG_SIZE) -#define TIPC_MEDIA_ADDR_OFFSET 5 +#define TIPC_MEDIA_INFO_OFFSET 5 /** * TIPC message buffer code @@ -688,7 +688,7 @@ static inline void msg_set_redundant_link(struct tipc_msg *m, u32 r) static inline char *msg_media_addr(struct tipc_msg *m) { - return (char *)&m->hdr[TIPC_MEDIA_ADDR_OFFSET]; + return (char *)&m->hdr[TIPC_MEDIA_INFO_OFFSET]; } /* |