Commit ecdae516 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski

ipv4: Remove redundant !ifa->ifa_dev check.

Now, ifa_dev is only set in inet_alloc_ifa() and never
NULL after ifa gets visible.

Let's remove the unneeded NULL check for ifa->ifa_dev.
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20240809235406.50187-4-kuniyu@amazon.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6e701eb9
...@@ -3185,8 +3185,7 @@ netxen_list_config_ip(struct netxen_adapter *adapter, ...@@ -3185,8 +3185,7 @@ netxen_list_config_ip(struct netxen_adapter *adapter,
struct list_head *head; struct list_head *head;
bool ret = false; bool ret = false;
dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL; dev = ifa->ifa_dev->dev;
if (dev == NULL) if (dev == NULL)
goto out; goto out;
...@@ -3379,7 +3378,7 @@ netxen_inetaddr_event(struct notifier_block *this, ...@@ -3379,7 +3378,7 @@ netxen_inetaddr_event(struct notifier_block *this,
struct in_ifaddr *ifa = (struct in_ifaddr *)ptr; struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
unsigned long ip_event; unsigned long ip_event;
dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL; dev = ifa->ifa_dev->dev;
ip_event = (event == NETDEV_UP) ? NX_IP_UP : NX_IP_DOWN; ip_event = (event == NETDEV_UP) ? NX_IP_UP : NX_IP_DOWN;
recheck: recheck:
if (dev == NULL) if (dev == NULL)
......
...@@ -4146,7 +4146,7 @@ qlcnic_inetaddr_event(struct notifier_block *this, ...@@ -4146,7 +4146,7 @@ qlcnic_inetaddr_event(struct notifier_block *this,
struct in_ifaddr *ifa = (struct in_ifaddr *)ptr; struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL; dev = ifa->ifa_dev->dev;
recheck: recheck:
if (dev == NULL) if (dev == NULL)
......
...@@ -234,8 +234,7 @@ static void inet_rcu_free_ifa(struct rcu_head *head) ...@@ -234,8 +234,7 @@ static void inet_rcu_free_ifa(struct rcu_head *head)
{ {
struct in_ifaddr *ifa = container_of(head, struct in_ifaddr, rcu_head); struct in_ifaddr *ifa = container_of(head, struct in_ifaddr, rcu_head);
if (ifa->ifa_dev) in_dev_put(ifa->ifa_dev);
in_dev_put(ifa->ifa_dev);
kfree(ifa); kfree(ifa);
} }
......
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