Commit a3da8adc authored by Julia Cartwright's avatar Julia Cartwright Committed by David S. Miller

net: macb: kill useless use of list_empty()

The list_for_each_entry() macro already handles the case where the list
is empty (by not executing the loop body).  It's not necessary to handle
this case specially, so stop doing so.

Cc: Rafal Ozieblo <rafalo@cadence.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarJulia Cartwright <julia@ni.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a63b255
...@@ -2812,24 +2812,20 @@ static int gem_add_flow_filter(struct net_device *netdev, ...@@ -2812,24 +2812,20 @@ static int gem_add_flow_filter(struct net_device *netdev,
htons(fs->h_u.tcp_ip4_spec.psrc), htons(fs->h_u.tcp_ip4_spec.pdst)); htons(fs->h_u.tcp_ip4_spec.psrc), htons(fs->h_u.tcp_ip4_spec.pdst));
/* find correct place to add in list */ /* find correct place to add in list */
if (list_empty(&bp->rx_fs_list.list)) list_for_each_entry(item, &bp->rx_fs_list.list, list) {
list_add(&newfs->list, &bp->rx_fs_list.list); if (item->fs.location > newfs->fs.location) {
else { list_add_tail(&newfs->list, &item->list);
list_for_each_entry(item, &bp->rx_fs_list.list, list) { added = true;
if (item->fs.location > newfs->fs.location) { break;
list_add_tail(&newfs->list, &item->list); } else if (item->fs.location == fs->location) {
added = true; netdev_err(netdev, "Rule not added: location %d not free!\n",
break; fs->location);
} else if (item->fs.location == fs->location) { ret = -EBUSY;
netdev_err(netdev, "Rule not added: location %d not free!\n", goto err;
fs->location);
ret = -EBUSY;
goto err;
}
} }
if (!added)
list_add_tail(&newfs->list, &bp->rx_fs_list.list);
} }
if (!added)
list_add_tail(&newfs->list, &bp->rx_fs_list.list);
gem_prog_cmp_regs(bp, fs); gem_prog_cmp_regs(bp, fs);
bp->rx_fs_list.count++; bp->rx_fs_list.count++;
...@@ -2851,9 +2847,6 @@ static int gem_del_flow_filter(struct net_device *netdev, ...@@ -2851,9 +2847,6 @@ static int gem_del_flow_filter(struct net_device *netdev,
struct ethtool_rx_fs_item *item; struct ethtool_rx_fs_item *item;
struct ethtool_rx_flow_spec *fs; struct ethtool_rx_flow_spec *fs;
if (list_empty(&bp->rx_fs_list.list))
return -EINVAL;
list_for_each_entry(item, &bp->rx_fs_list.list, list) { list_for_each_entry(item, &bp->rx_fs_list.list, list) {
if (item->fs.location == cmd->fs.location) { if (item->fs.location == cmd->fs.location) {
/* disable screener regs for the flow entry */ /* disable screener regs for the flow entry */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment