diff options
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index fa97d9649a28..f8a8255a7182 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -1637,9 +1637,12 @@ int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info) | |||
1637 | char *name; | 1637 | char *name; |
1638 | struct tipc_link *link; | 1638 | struct tipc_link *link; |
1639 | struct tipc_node *node; | 1639 | struct tipc_node *node; |
1640 | struct sk_buff_head xmitq; | ||
1640 | struct nlattr *attrs[TIPC_NLA_LINK_MAX + 1]; | 1641 | struct nlattr *attrs[TIPC_NLA_LINK_MAX + 1]; |
1641 | struct net *net = sock_net(skb->sk); | 1642 | struct net *net = sock_net(skb->sk); |
1642 | 1643 | ||
1644 | __skb_queue_head_init(&xmitq); | ||
1645 | |||
1643 | if (!info->attrs[TIPC_NLA_LINK]) | 1646 | if (!info->attrs[TIPC_NLA_LINK]) |
1644 | return -EINVAL; | 1647 | return -EINVAL; |
1645 | 1648 | ||
@@ -1683,13 +1686,13 @@ int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info) | |||
1683 | u32 tol; | 1686 | u32 tol; |
1684 | 1687 | ||
1685 | tol = nla_get_u32(props[TIPC_NLA_PROP_TOL]); | 1688 | tol = nla_get_u32(props[TIPC_NLA_PROP_TOL]); |
1686 | tipc_link_set_tolerance(link, tol); | 1689 | tipc_link_set_tolerance(link, tol, &xmitq); |
1687 | } | 1690 | } |
1688 | if (props[TIPC_NLA_PROP_PRIO]) { | 1691 | if (props[TIPC_NLA_PROP_PRIO]) { |
1689 | u32 prio; | 1692 | u32 prio; |
1690 | 1693 | ||
1691 | prio = nla_get_u32(props[TIPC_NLA_PROP_PRIO]); | 1694 | prio = nla_get_u32(props[TIPC_NLA_PROP_PRIO]); |
1692 | tipc_link_set_prio(link, prio); | 1695 | tipc_link_set_prio(link, prio, &xmitq); |
1693 | } | 1696 | } |
1694 | if (props[TIPC_NLA_PROP_WIN]) { | 1697 | if (props[TIPC_NLA_PROP_WIN]) { |
1695 | u32 win; | 1698 | u32 win; |
@@ -1701,7 +1704,7 @@ int tipc_nl_node_set_link(struct sk_buff *skb, struct genl_info *info) | |||
1701 | 1704 | ||
1702 | out: | 1705 | out: |
1703 | tipc_node_read_unlock(node); | 1706 | tipc_node_read_unlock(node); |
1704 | 1707 | tipc_bearer_xmit(net, bearer_id, &xmitq, &node->links[bearer_id].maddr); | |
1705 | return res; | 1708 | return res; |
1706 | } | 1709 | } |
1707 | 1710 | ||