rpms/kernel/FC-6 jwltest-mac80211-backport-2_6_20-fixup.patch, 1.1.8.1, 1.1.8.2

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv27920

Modified Files:
      Tag: private-linville-jwltest-fc6-31-branch
	jwltest-mac80211-backport-2_6_20-fixup.patch 
Log Message:


jwltest-mac80211-backport-2_6_20-fixup.patch:
 core.c    |    6 ++++--
 nl80211.c |    4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

Index: jwltest-mac80211-backport-2_6_20-fixup.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/Attic/jwltest-mac80211-backport-2_6_20-fixup.patch,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- jwltest-mac80211-backport-2_6_20-fixup.patch	12 Apr 2007 15:57:32 -0000	1.1.8.1
+++ jwltest-mac80211-backport-2_6_20-fixup.patch	12 Apr 2007 16:59:33 -0000	1.1.8.2
@@ -1,6 +1,42 @@
---- linux-2.6.20.noarch/net/wireless/core.c.orig	2007-04-12 11:08:24.000000000 -0400
-+++ linux-2.6.20.noarch/net/wireless/core.c	2007-04-12 11:17:34.000000000 -0400
-@@ -291,7 +291,7 @@ static int cfg80211_netdev_notifier_call
+--- linux-2.6.20.noarch/net/wireless/nl80211.c.orig	2007-04-12 12:57:55.000000000 -0400
++++ linux-2.6.20.noarch/net/wireless/nl80211.c	2007-04-12 12:57:51.000000000 -0400
+@@ -694,6 +694,7 @@ static int nl80211_rename_wiphy(struct s
+ 	struct cfg80211_registered_device *rdev;
+ 	int result;
+ 
++#if 0 /* Not in FC6 */
+ 	if (!info->attrs[NL80211_ATTR_WIPHY_NAME])
+ 		return -EINVAL;
+ 
+@@ -705,6 +706,9 @@ static int nl80211_rename_wiphy(struct s
+ 
+ 	cfg80211_put_dev(rdev);
+ 	return result;
++#else
++	return -EINVAL;
++#endif
+ }
+ 
+ static int nl80211_key_cmd(struct sk_buff *skb, struct genl_info *info)
+--- linux-2.6.20.noarch/net/wireless/core.c.orig	2007-04-12 12:55:32.000000000 -0400
++++ linux-2.6.20.noarch/net/wireless/core.c	2007-04-12 12:58:36.000000000 -0400
+@@ -141,6 +141,7 @@ void cfg80211_put_dev(struct cfg80211_re
+ 	mutex_unlock(&drv->mtx);
+ }
+ 
++#if 0 /* Not in FC6 */
+ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
+ 			char *newname)
+ {
+@@ -172,6 +173,7 @@ int cfg80211_dev_rename(struct cfg80211_
+ 
+ 	return 0;
+ }
++#endif
+ 
+ /* exported functions */
+ 
+@@ -291,7 +293,7 @@ static int cfg80211_netdev_notifier_call
  	case NETDEV_REGISTER:
  		mutex_lock(&rdev->devlist_mtx);
  		list_add(&dev->ieee80211_ptr->list, &rdev->netdev_list);
@@ -9,7 +45,7 @@
  				      "phy80211")) {
  			printk(KERN_ERR "wireless: failed to add phy80211 symlink to netdev!\n");
  		}
-@@ -301,7 +301,7 @@ static int cfg80211_netdev_notifier_call
+@@ -301,7 +303,7 @@ static int cfg80211_netdev_notifier_call
  	case NETDEV_UNREGISTER:
  		mutex_lock(&rdev->devlist_mtx);
  		if (!list_empty(&dev->ieee80211_ptr->list)) {