diff options
| author |   Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com> | 2017-08-28 17:57:02 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-29 15:07:33 -0700 |
| commit | d55c60eba0ef44ec21831ce26db300763eafd865 (patch) | |
| tree | 004c053b1510454aa4629f4bc230c64799dd377b /net/tipc/bearer.h | |
| parent | ipv6: do not set sk_destruct in IPV6_ADDRFORM sockopt (diff) | |
| download | linux-dev-d55c60eba0ef44ec21831ce26db300763eafd865.tar.xz linux-dev-d55c60eba0ef44ec21831ce26db300763eafd865.zip | |
tipc: permit bond slave as bearer
For a bond slave device as a tipc bearer, the dev represents the bond
interface and orig_dev represents the slave in tipc_l2_rcv_msg().
Since we decode the tipc_ptr from bonding device (dev), we fail to
find the bearer and thus tipc links are not established.
In this commit, we register the tipc protocol callback per device and
look for tipc bearer from both the devices.
Signed-off-by: Parthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bearer.h')
| -rw-r--r-- | net/tipc/bearer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 635c9086e19a..e07a55a80c18 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -131,6 +131,7 @@ struct tipc_media { * @name: bearer name (format = media:interface) * @media: ptr to media structure associated with bearer * @bcast_addr: media address used in broadcasting + * @pt: packet type for bearer * @rcu: rcu struct for tipc_bearer * @priority: default link priority for bearer * @window: default window size for bearer @@ -151,6 +152,7 @@ struct tipc_bearer { char name[TIPC_MAX_BEARER_NAME]; struct tipc_media *media; struct tipc_media_addr bcast_addr; + struct packet_type pt; struct rcu_head rcu; u32 priority; u32 window; |