diff options
author | Patrick McHardy <kaber@trash.net> | 2013-04-17 02:18:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-17 14:18:33 -0400 |
commit | 8aeb89f214cdb4c3d9e43213d52d4c5b0fb93bbb (patch) | |
tree | ba2175f89efa688ad4e58e0d21842dce4f4c34da /net/tipc/discover.c | |
parent | ccc4ba2ea23e4507c174620405c5de7bee328f99 (diff) |
tipc: move bcast_addr from struct tipc_media to struct tipc_bearer
Some network protocols, like InfiniBand, don't have a fixed broadcast
address but one that depends on the configuration. Move the bcast_addr
to struct tipc_bearer and initialize it with the broadcast address of
the network device when the bearer is enabled.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/discover.c')
-rw-r--r-- | net/tipc/discover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index 1074b9587e81..eedff58d0387 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
@@ -129,7 +129,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct tipc_bearer *b_ptr) | |||
129 | int link_fully_up; | 129 | int link_fully_up; |
130 | 130 | ||
131 | media_addr.broadcast = 1; | 131 | media_addr.broadcast = 1; |
132 | b_ptr->media->msg2addr(&media_addr, msg_media_addr(msg)); | 132 | b_ptr->media->msg2addr(b_ptr, &media_addr, msg_media_addr(msg)); |
133 | kfree_skb(buf); | 133 | kfree_skb(buf); |
134 | 134 | ||
135 | /* Ensure message from node is valid and communication is permitted */ | 135 | /* Ensure message from node is valid and communication is permitted */ |