iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sctp: move skb_dst_set() a bit downwards in sctp_packet_transmit()

Browse Source 
skb_dst_set will use dst, if dst is NULL although is not a problem,
then goto the 'no_route' and free nskb, so do the skb_dst_set is pointless.
so move the skb_dst_set after dst check.
Remove the unnecessary initialization as well.

v2: fix the subject line because it would confuse people,
    as pointed out by Daniel.

Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
wangweidong 2013-12-26 13:55:56 +08:00 committed by David S. Miller
parent 6a031f67c8
commit 0438816efd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sctp/output.c
View File

@ -387,7 +387,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
int err = 0; int err = 0;
int padding; /* How much padding do we need? */ int padding; /* How much padding do we need? */
__u8 has_data = 0; __u8 has_data = 0;
struct dst_entry *dst = tp->dst; struct dst_entry *dst;
unsigned char *auth = NULL; /* pointer to auth in skb data */ unsigned char *auth = NULL; /* pointer to auth in skb data */
pr_debug("%s: packet:%p\n", __func__, packet); pr_debug("%s: packet:%p\n", __func__, packet);
@ -420,9 +420,9 @@ int sctp_packet_transmit(struct sctp_packet *packet)
} }
} }
dst = dst_clone(tp->dst); dst = dst_clone(tp->dst);
skb_dst_set(nskb, dst);
if (!dst) if (!dst)
goto no_route; goto no_route;
skb_dst_set(nskb, dst);
/* Build the SCTP header. */ /* Build the SCTP header. */
sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr)); sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr));