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: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20240809235406.50187-4-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index ed24d6af7487b02da3d0d50ef3df7b296bb14b04..9cff0a8ffb2c55de195983051e4e7f8568528c0f 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -3185,8 +3185,7 @@ netxen_list_config_ip(struct netxen_adapter *adapter,
        struct list_head *head;
        bool ret = false;
 
-       dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL;
-
+       dev = ifa->ifa_dev->dev;
        if (dev == NULL)
                goto out;
 
@@ -3379,7 +3378,7 @@ netxen_inetaddr_event(struct notifier_block *this,
        struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
        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;
 recheck:
        if (dev == NULL)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 90df4a0909fa2ca422750dd0119b7dbe5e104231..b3588a1ebc25f466576f593f6178778730987f32 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -4146,7 +4146,7 @@ qlcnic_inetaddr_event(struct notifier_block *this,
 
        struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
 
-       dev = ifa->ifa_dev ? ifa->ifa_dev->dev : NULL;
+       dev = ifa->ifa_dev->dev;
 
 recheck:
        if (dev == NULL)

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 9f4add07e67d7bb576981146598b553e5cb8606c..baf036bfad76e34009ccd81fc280e6932a0a7a68 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -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);
 
-       if (ifa->ifa_dev)
-               in_dev_put(ifa->ifa_dev);
+       in_dev_put(ifa->ifa_dev);
        kfree(ifa);
 }