diff options
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r-- | net/tipc/link.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index dd3155b14654..289e848084ac 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c | |||
@@ -959,7 +959,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, | |||
959 | pr_warn("Too large msg, purging xmit list %d %d %d %d %d!\n", | 959 | pr_warn("Too large msg, purging xmit list %d %d %d %d %d!\n", |
960 | skb_queue_len(list), msg_user(hdr), | 960 | skb_queue_len(list), msg_user(hdr), |
961 | msg_type(hdr), msg_size(hdr), mtu); | 961 | msg_type(hdr), msg_size(hdr), mtu); |
962 | skb_queue_purge(list); | 962 | __skb_queue_purge(list); |
963 | return -EMSGSIZE; | 963 | return -EMSGSIZE; |
964 | } | 964 | } |
965 | 965 | ||
@@ -988,7 +988,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list, | |||
988 | if (likely(skb_queue_len(transmq) < maxwin)) { | 988 | if (likely(skb_queue_len(transmq) < maxwin)) { |
989 | _skb = skb_clone(skb, GFP_ATOMIC); | 989 | _skb = skb_clone(skb, GFP_ATOMIC); |
990 | if (!_skb) { | 990 | if (!_skb) { |
991 | skb_queue_purge(list); | 991 | __skb_queue_purge(list); |
992 | return -ENOBUFS; | 992 | return -ENOBUFS; |
993 | } | 993 | } |
994 | __skb_dequeue(list); | 994 | __skb_dequeue(list); |
@@ -1668,7 +1668,7 @@ void tipc_link_create_dummy_tnl_msg(struct tipc_link *l, | |||
1668 | struct sk_buff *skb; | 1668 | struct sk_buff *skb; |
1669 | u32 dnode = l->addr; | 1669 | u32 dnode = l->addr; |
1670 | 1670 | ||
1671 | skb_queue_head_init(&tnlq); | 1671 | __skb_queue_head_init(&tnlq); |
1672 | skb = tipc_msg_create(TUNNEL_PROTOCOL, FAILOVER_MSG, | 1672 | skb = tipc_msg_create(TUNNEL_PROTOCOL, FAILOVER_MSG, |
1673 | INT_H_SIZE, BASIC_H_SIZE, | 1673 | INT_H_SIZE, BASIC_H_SIZE, |
1674 | dnode, onode, 0, 0, 0); | 1674 | dnode, onode, 0, 0, 0); |
@@ -1708,9 +1708,9 @@ void tipc_link_tnl_prepare(struct tipc_link *l, struct tipc_link *tnl, | |||
1708 | if (!tnl) | 1708 | if (!tnl) |
1709 | return; | 1709 | return; |
1710 | 1710 | ||
1711 | skb_queue_head_init(&tnlq); | 1711 | __skb_queue_head_init(&tnlq); |
1712 | skb_queue_head_init(&tmpxq); | 1712 | __skb_queue_head_init(&tmpxq); |
1713 | skb_queue_head_init(&frags); | 1713 | __skb_queue_head_init(&frags); |
1714 | 1714 | ||
1715 | /* At least one packet required for safe algorithm => add dummy */ | 1715 | /* At least one packet required for safe algorithm => add dummy */ |
1716 | skb = tipc_msg_create(TIPC_LOW_IMPORTANCE, TIPC_DIRECT_MSG, | 1716 | skb = tipc_msg_create(TIPC_LOW_IMPORTANCE, TIPC_DIRECT_MSG, |
@@ -1720,7 +1720,7 @@ void tipc_link_tnl_prepare(struct tipc_link *l, struct tipc_link *tnl, | |||
1720 | pr_warn("%sunable to create tunnel packet\n", link_co_err); | 1720 | pr_warn("%sunable to create tunnel packet\n", link_co_err); |
1721 | return; | 1721 | return; |
1722 | } | 1722 | } |
1723 | skb_queue_tail(&tnlq, skb); | 1723 | __skb_queue_tail(&tnlq, skb); |
1724 | tipc_link_xmit(l, &tnlq, &tmpxq); | 1724 | tipc_link_xmit(l, &tnlq, &tmpxq); |
1725 | __skb_queue_purge(&tmpxq); | 1725 | __skb_queue_purge(&tmpxq); |
1726 | 1726 | ||