diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-14 12:24:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-14 12:24:46 -0400 |
| commit | b55b10bebb86a436bebd5c754f80076ad51f4068 (patch) | |
| tree | 89be13ccd5e7dc4c904f28fde9ebf9ee17f1bb0a /net/tipc/net.c | |
| parent | c16ead798ee31f154eb230a728de6c60d0786aab (diff) | |
| parent | dd3f9e70f59f43a5712eba9cf3ee4f1e6999540c (diff) | |
Merge branch 'tipc-next'
Jon Maloy says:
====================
tipc: some link layer improvements
We continue eliminating redundant complexity at the link layer, and
add a couple of improvements to the packet sending functionality.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index a54f3cbe2246..d6d1399ae229 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -40,6 +40,7 @@ #include "subscr.h" #include "socket.h" #include "node.h" +#include "bcast.h" static const struct nla_policy tipc_nl_net_policy[TIPC_NLA_NET_MAX + 1] = { [TIPC_NLA_NET_UNSPEC] = { .type = NLA_UNSPEC }, |