diff options
| author | Michael Chan <mchan@broadcom.com> | 2010-12-23 07:42:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-23 11:44:28 -0800 |
| commit | 8adc9240f98a816f7e9b3d93b9446a790110e062 (patch) | |
| tree | ab3fbcfb3d29a9a3a1bbafd861a38f649d690e70 | |
| parent | 9b09336072796378dac46df63bcd43291b24fd12 (diff) | |
| download | linux-8adc9240f98a816f7e9b3d93b9446a790110e062.tar.gz linux-8adc9240f98a816f7e9b3d93b9446a790110e062.tar.bz2 linux-8adc9240f98a816f7e9b3d93b9446a790110e062.zip | |
cnic: Prevent "scheduling while atomic" when calling ->cnic_init()
cnic_dev_list is protected by rtnl_lock and cnic_dev_lock spin_lock during
modifications. When looping on cnic_dev_list and calling ->cnic_init(),
we should just hold rtnl_lock since ->cnic_init() may sleep.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/cnic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 9c2e7860b18e..3a7d3ce6db7b 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -59,6 +59,7 @@ MODULE_DESCRIPTION("Broadcom NetXtreme II CNIC Driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(CNIC_MODULE_VERSION); +/* cnic_dev_list modifications are protected by both rtnl and cnic_dev_lock */ static LIST_HEAD(cnic_dev_list); static LIST_HEAD(cnic_udev_list); static DEFINE_RWLOCK(cnic_dev_lock); @@ -445,14 +446,12 @@ int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops) /* Prevent race conditions with netdev_event */ rtnl_lock(); - read_lock(&cnic_dev_lock); list_for_each_entry(dev, &cnic_dev_list, list) { struct cnic_local *cp = dev->cnic_priv; if (!test_and_set_bit(ULP_F_INIT, &cp->ulp_flags[ulp_type])) ulp_ops->cnic_init(dev); } - read_unlock(&cnic_dev_lock); rtnl_unlock(); return 0; |