| Message ID | 52BBC4EC.2070303@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Dec 26, 2013 at 01:55:56PM +0800, Wang Weidong wrote: > 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> Acked-by: Neil Horman <nhorman@tuxdriver.com> > --- > net/sctp/output.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/sctp/output.c b/net/sctp/output.c > index 3be70a4..9b76d62 100644 > --- a/net/sctp/output.c > +++ b/net/sctp/output.c > @@ -387,7 +387,7 @@ int sctp_packet_transmit(struct sctp_packet *packet) > int err = 0; > int padding; /* How much padding do we need? */ > __u8 has_data = 0; > - struct dst_entry *dst = tp->dst; > + struct dst_entry *dst; > unsigned char *auth = NULL; /* pointer to auth in skb data */ > > 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); > - skb_dst_set(nskb, dst); > if (!dst) > goto no_route; > + skb_dst_set(nskb, dst); > > /* Build the SCTP header. */ > sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr)); > -- > 1.7.12 > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-sctp" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/output.c b/net/sctp/output.c index 3be70a4..9b76d62 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -387,7 +387,7 @@ int sctp_packet_transmit(struct sctp_packet *packet) int err = 0; int padding; /* How much padding do we need? */ __u8 has_data = 0; - struct dst_entry *dst = tp->dst; + struct dst_entry *dst; unsigned char *auth = NULL; /* pointer to auth in skb data */ 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); - skb_dst_set(nskb, dst); if (!dst) goto no_route; + skb_dst_set(nskb, dst); /* Build the SCTP header. */ sh = (struct sctphdr *)skb_push(nskb, sizeof(struct sctphdr));
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> --- net/sctp/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)