---

yaml --- r: 352011 b: refs/heads/master c: 22fd5ab h: refs/heads/master i: 352009: 418fcec 352007: a8d077a v: v3
git-mirror · Jan 31, 2013 · 06171f1 · 06171f1
1 parent d8d167f
commit 06171f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}