diff options
author | Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 2012-03-23 02:32:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-23 14:51:31 -0400 |
commit | 1d5c88e3f5403c1910477e4bcc71c3d5d40de6d5 (patch) | |
tree | 9014eb99c25fe4efa023db8920e9cd031a0e9d72 /drivers/net/ethernet | |
parent | f1e84eb3bba3d6a5691ce1832ff7e550768560d8 (diff) |
qlcnic: Bug fix for LRO
- After FW reset, IP addresses need to be reprogrammed to FW for LRO to work. This
was not happening in context reset path. Fixed it here.
- Updated driver version to 5.0.27
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h index 2b5af22419a5..385a4d5c7c25 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | |||
@@ -36,8 +36,8 @@ | |||
36 | 36 | ||
37 | #define _QLCNIC_LINUX_MAJOR 5 | 37 | #define _QLCNIC_LINUX_MAJOR 5 |
38 | #define _QLCNIC_LINUX_MINOR 0 | 38 | #define _QLCNIC_LINUX_MINOR 0 |
39 | #define _QLCNIC_LINUX_SUBVERSION 25 | 39 | #define _QLCNIC_LINUX_SUBVERSION 27 |
40 | #define QLCNIC_LINUX_VERSIONID "5.0.26" | 40 | #define QLCNIC_LINUX_VERSIONID "5.0.27" |
41 | #define QLCNIC_DRV_IDC_VER 0x01 | 41 | #define QLCNIC_DRV_IDC_VER 0x01 |
42 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ | 42 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ |
43 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) | 43 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 81bb1a69e69f..75c32e875fef 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -1458,8 +1458,10 @@ qlcnic_reset_context(struct qlcnic_adapter *adapter) | |||
1458 | 1458 | ||
1459 | if (netif_running(netdev)) { | 1459 | if (netif_running(netdev)) { |
1460 | err = qlcnic_attach(adapter); | 1460 | err = qlcnic_attach(adapter); |
1461 | if (!err) | 1461 | if (!err) { |
1462 | __qlcnic_up(adapter, netdev); | 1462 | __qlcnic_up(adapter, netdev); |
1463 | qlcnic_restore_indev_addr(netdev, NETDEV_UP); | ||
1464 | } | ||
1463 | } | 1465 | } |
1464 | 1466 | ||
1465 | netif_device_attach(netdev); | 1467 | netif_device_attach(netdev); |