| Message ID | 20220319052350.26535-1-xiam0nd.tong@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | myri10ge: remove an unneed NULL check | expand |
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 50ac3ee2577a..424160dd650c 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -2903,12 +2903,10 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb, status = myri10ge_xmit(curr, dev); if (status != 0) { dev_kfree_skb_any(curr); - if (segs != NULL) { - curr = segs; - segs = next; - curr->next = NULL; - dev_kfree_skb_any(segs); - } + curr = segs; + segs = next; + curr->next = NULL; + dev_kfree_skb_any(segs); goto drop; } }
The define of skb_list_walk_safe(first, skb, next_skb) is: for ((skb) = (first), (next_skb) = (skb) ? (skb)->next : NULL; (skb); \ (skb) = (next_skb), (next_skb) = (skb) ? (skb)->next : NULL) Thus, if the 'segs' passed as 'first' into the skb_list_walk_safe is NULL, the loop will exit immediately. In other words, it can be sure the 'segs' is non-NULL when we run inside the loop. So just remove the unnecessary NULL check. Signed-off-by: Xiaomeng Tong <xiam0nd.tong@gmail.com> --- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)