From 06171f1c6242ca0bcc560af3fdcb823a3265a9d9 Mon Sep 17 00:00:00 2001 From: Manish chopra Date: Wed, 30 Jan 2013 12:47:17 +0000 Subject: [PATCH] --- yaml --- r: 352011 b: refs/heads/master c: 22fd5ab4623883ea895e48b1288f97856294d17d h: refs/heads/master i: 352009: 418fceca444b9a938f3db41b67dde1666cdcb217 352007: a8d077a9232bc8c90c56da22989135f7b40cac30 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a2cb60a3de0a..00b0cf96cb61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d53f40f541ab29c15982774abddbad4c361cc8c +refs/heads/master: 22fd5ab4623883ea895e48b1288f97856294d17d diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 4e4ebafac5c9..88a2330c9572 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c @@ -932,7 +932,8 @@ netdev_features_t qlcnic_fix_features(struct net_device *netdev, { struct qlcnic_adapter *adapter = netdev_priv(netdev); - if ((adapter->flags & QLCNIC_ESWITCH_ENABLED)) { + if ((adapter->flags & QLCNIC_ESWITCH_ENABLED) && + qlcnic_82xx_check(adapter)) { netdev_features_t changed = features ^ netdev->features; features ^= changed & (NETIF_F_ALL_CSUM | NETIF_F_RXCSUM); }