diff options
| author | Allan Stephens <Allan.Stephens@windriver.com> | 2011-02-28 16:02:30 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-13 16:35:18 -0400 |
| commit | d901a42b271dbd94983b798955403dcf1afa60ac (patch) | |
| tree | b6ca357a559431559ab747a341b156a21885a3e3 /net/tipc | |
| parent | a2b58de2e3993a23b092ae54a35c38bf0dacb618 (diff) | |
| download | linux-stable-d901a42b271dbd94983b798955403dcf1afa60ac.tar.gz linux-stable-d901a42b271dbd94983b798955403dcf1afa60ac.tar.bz2 linux-stable-d901a42b271dbd94983b798955403dcf1afa60ac.zip | |
tipc: Eliminate unnecessary constant for neighbor discovery msg size
Eliminates an unnecessary constant that defines the size of a LINK_CONFIG
message, and uses one of the existing standard message size symbols in
its place. (The defunct constant was located in the wrong place anyway,
since it was grouped with other constants that define message users instead
of message sizes.)
Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/discover.c | 4 | ||||
| -rw-r--r-- | net/tipc/msg.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index caac5c93b7f7..2c14d6dbc3d7 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c @@ -75,12 +75,12 @@ static struct sk_buff *tipc_disc_init_msg(u32 type, u32 dest_domain, struct tipc_bearer *b_ptr) { - struct sk_buff *buf = tipc_buf_acquire(DSC_H_SIZE); + struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE); struct tipc_msg *msg; if (buf) { msg = buf_msg(buf); - tipc_msg_init(msg, LINK_CONFIG, type, DSC_H_SIZE, dest_domain); + tipc_msg_init(msg, LINK_CONFIG, type, INT_H_SIZE, dest_domain); msg_set_non_seq(msg, 1); msg_set_dest_domain(msg, dest_domain); msg_set_bc_netid(msg, tipc_net_id); diff --git a/net/tipc/msg.h b/net/tipc/msg.h index bea0126cb676..50063664b93f 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h @@ -525,7 +525,6 @@ static inline struct tipc_msg *msg_get_wrapped(struct tipc_msg *m) #define NAME_DISTRIBUTOR 11 #define MSG_FRAGMENTER 12 #define LINK_CONFIG 13 -#define DSC_H_SIZE 40 /* * Connection management protocol messages |