diff options
| author | Patrick McHardy <kaber@trash.net> | 2013-04-17 06:18:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-17 14:18:33 -0400 |
| commit | 8aeb89f214cdb4c3d9e43213d52d4c5b0fb93bbb (patch) | |
| tree | ba2175f89efa688ad4e58e0d21842dce4f4c34da /net/tipc/bcast.c | |
| parent | ccc4ba2ea23e4507c174620405c5de7bee328f99 (diff) | |
| download | linux-8aeb89f214cdb4c3d9e43213d52d4c5b0fb93bbb.tar.bz2 | |
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/bcast.c')
| -rw-r--r-- | net/tipc/bcast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index 2655c9f4ecad..25e159c2feb4 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c @@ -620,10 +620,10 @@ static int tipc_bcbearer_send(struct sk_buff *buf, continue; /* bearer pair doesn't add anything */ if (!tipc_bearer_blocked(p)) - tipc_bearer_send(p, buf, &p->media->bcast_addr); + tipc_bearer_send(p, buf, &p->bcast_addr); else if (s && !tipc_bearer_blocked(s)) /* unable to send on primary bearer */ - tipc_bearer_send(s, buf, &s->media->bcast_addr); + tipc_bearer_send(s, buf, &s->bcast_addr); else /* unable to send on either bearer */ continue; |