Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 42bb8d56953a06de50941d6d3df89dc3023bb92d

Authored by Michael Chan
Committed by David S. Miller
1 parent 57045c996f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver() 

We should call bnx2i to send the iSCSI netlink message earlier in
cnic_unregister_device().  By the time cnic_unregister_driver() is
called, bnx2i may have freed data structures used by the upcalls.

Update version to 2.2.12.

Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 6 additions and 19 deletions Side-by-side Diff

... ... @@ -426,19 +426,6 @@
426 426 return 0;
427 427 }
428 428  
429   -static void cnic_uio_stop(void)
430   -{
431   - struct cnic_dev *dev;
432   -
433   - read_lock(&cnic_dev_lock);
434   - list_for_each_entry(dev, &cnic_dev_list, list) {
435   - struct cnic_local *cp = dev->cnic_priv;
436   -
437   - cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
438   - }
439   - read_unlock(&cnic_dev_lock);
440   -}
441   -
442 429 int cnic_register_driver(int ulp_type, struct cnic_ulp_ops *ulp_ops)
443 430 {
444 431 struct cnic_dev *dev;
... ... @@ -510,9 +497,6 @@
510 497 }
511 498 read_unlock(&cnic_dev_lock);
512 499  
513   - if (ulp_type == CNIC_ULP_ISCSI)
514   - cnic_uio_stop();
515   -
516 500 rcu_assign_pointer(cnic_ulp_tbl[ulp_type], NULL);
517 501  
518 502 mutex_unlock(&cnic_lock);
... ... @@ -595,6 +579,9 @@
595 579 return -EINVAL;
596 580 }
597 581 mutex_unlock(&cnic_lock);
  582 +
  583 + if (ulp_type == CNIC_ULP_ISCSI)
  584 + cnic_send_nlmsg(cp, ISCSI_KEVENT_IF_DOWN, NULL);
598 585  
599 586 synchronize_rcu();
600 587  
drivers/net/cnic_if.h
Diff comments   View file @ 42bb8d5
1 1 /* cnic_if.h: Broadcom CNIC core network driver.
2 2 *
3   - * Copyright (c) 2006-2010 Broadcom Corporation
  3 + * Copyright (c) 2006-2011 Broadcom Corporation
4 4 *
5 5 * This program is free software; you can redistribute it and/or modify
6 6 * it under the terms of the GNU General Public License as published by
... ... @@ -12,8 +12,8 @@
12 12 #ifndef CNIC_IF_H
13 13 #define CNIC_IF_H
14 14  
15   -#define CNIC_MODULE_VERSION "2.2.11"
16   -#define CNIC_MODULE_RELDATE "Dec 22, 2010"
  15 +#define CNIC_MODULE_VERSION "2.2.12"
  16 +#define CNIC_MODULE_RELDATE "Jan 03, 2011"
17 17  
18 18 #define CNIC_ULP_RDMA 0
19 19 #define CNIC_ULP_ISCSI 1