Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

sctp: remove temporary variable confirm from sctp_packet_transmit

Browse Source 
Commit c86a773c78 ("sctp: add dst_pending_confirm flag") introduced
a temporary variable "confirm" in sctp_packet_transmit.

But it broke the rule that longer lines should be above shorter ones.
Besides, this variable is not necessary, so this patch is to just
remove it and use tp->dst_pending_confirm directly.

Fixes: c86a773c78 ("sctp: add dst_pending_confirm flag")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2017-03-18 19:12:22 +08:00 committed by David S. Miller
parent 3dc857f0e8
commit 486a43db2e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/sctp/output.c
View File

@ -546,7 +546,6 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp)
struct sctp_association *asoc = tp->asoc; struct sctp_association *asoc = tp->asoc;
struct sctp_chunk *chunk, *tmp; struct sctp_chunk *chunk, *tmp;
int pkt_count, gso = 0; int pkt_count, gso = 0;
int confirm;
struct dst_entry *dst; struct dst_entry *dst;
struct sk_buff *head; struct sk_buff *head;
struct sctphdr *sh; struct sctphdr *sh;
@ -625,13 +624,13 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp)
asoc->peer.last_sent_to = tp; asoc->peer.last_sent_to = tp;
} }
head->ignore_df = packet->ipfragok; head->ignore_df = packet->ipfragok;
confirm = tp->dst_pending_confirm; if (tp->dst_pending_confirm)
if (confirm)
skb_set_dst_pending_confirm(head, 1); skb_set_dst_pending_confirm(head, 1);
/* neighbour should be confirmed on successful transmission or /* neighbour should be confirmed on successful transmission or
* positive error * positive error
*/ */
if (tp->af_specific->sctp_xmit(head, tp) >= 0 && confirm) if (tp->af_specific->sctp_xmit(head, tp) >= 0 &&
tp->dst_pending_confirm)
tp->dst_pending_confirm = 0; tp->dst_pending_confirm = 0;
out: out: