Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6b92c25 authored by Anish Bhatt's avatar Anish Bhatt Committed by David S. Miller
Browse files

cxgb4i : remove spurious use of rcu 



As pointed out by the intel guys, there is no need to hold rcu read lock in
cxgbi_inet6addr_handler(), this patch removes it.

Fixes: 759a0cc5 ("cxgb4i: Add ipv6 code to driver, call into libcxgbi ipv6 api")
Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bae2e81a

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

+5 −9
Original line number Diff line number Diff line
@@ -1646,25 +1646,22 @@ static int cxgbi_inet6addr_handler(struct notifier_block *this, 
	struct cxgbi_device *cdev;

	int ret = NOTIFY_DONE;



	rcu_read_lock();



	if (event_dev->priv_flags & IFF_802_1Q_VLAN)

		event_dev = vlan_dev_real_dev(event_dev);



	cdev = cxgbi_device_find_by_netdev(event_dev, NULL);

	if (!cdev) {

		rcu_read_unlock();



	if (!cdev)

		return ret;

	}



	switch (event) {

	case NETDEV_UP:

		ret = cxgb4_clip_get(event_dev,

				     (const struct in6_addr *)

				     ((ifa)->addr.s6_addr));

		if (ret < 0) {

			rcu_read_unlock();

		if (ret < 0)

			return ret;

		}



		ret = NOTIFY_OK;

		break;
@@ -1679,7 +1676,6 @@ static int cxgbi_inet6addr_handler(struct notifier_block *this, 
		break;

	}



	rcu_read_unlock();

	return ret;

}