---

yaml --- r: 175550 b: refs/heads/master c: d55fb89 h: refs/heads/master v: v3
git-mirror · Dec 9, 2009 · c672a5c · c672a5c
1 parent d74ad71
commit c672a5c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c557c15d83ea16e6c1a043c8eccb0f60bb19cb96
+refs/heads/master: d55fb891f9da8ee17374349ff482b2715623b7e5
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -2696,7 +2696,6 @@ config NETXEN_NIC
 config NIU
 	tristate "Sun Neptune 10Gbit Ethernet support"
 	depends on PCI
-	select CRC32
 	help
 	  This enables support for cards based upon Sun's
 	  Neptune chipset.

diff --git a/trunk/net/wireless/wext-compat.c b/trunk/net/wireless/wext-compat.c
@@ -479,6 +479,7 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
 			}
 			err = rdev->ops->del_key(&rdev->wiphy, dev, idx, addr);
 		}
+		wdev->wext.connect.privacy = false;
 		/*
 		 * Applications using wireless extensions expect to be
 		 * able to delete keys that don't exist, so allow that.