rpms/kernel/F-8 linux-2.6-cfg80211-extras.patch, 1.5, 1.6 kernel.spec, 1.447, 1.448

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32039

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-cfg80211-extras.patch 
Log Message:
Restore ability to add/remove virtual i/fs to mac80211 devices via sysfs

linux-2.6-cfg80211-extras.patch:

Index: linux-2.6-cfg80211-extras.patch
===================================================================
RCS file: linux-2.6-cfg80211-extras.patch
diff -N linux-2.6-cfg80211-extras.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-cfg80211-extras.patch	22 May 2008 14:57:45 -0000	1.6
@@ -0,0 +1,66 @@
+diff -up linux-2.6.24.noarch/net/wireless/sysfs.c.orig linux-2.6.24.noarch/net/wireless/sysfs.c
+--- linux-2.6.24.noarch/net/wireless/sysfs.c.orig	2008-03-10 17:16:42.000000000 -0400
++++ linux-2.6.24.noarch/net/wireless/sysfs.c	2008-03-10 17:20:55.000000000 -0400
+@@ -39,9 +39,62 @@ static ssize_t _show_permaddr(struct dev
+ 		       addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ }
+ 
++static ssize_t _store_add_iface(struct device *dev,
++				struct device_attribute *attr,
++				const char *buf, size_t len)
++{
++	struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
++	int res;
++
++	if (!capable(CAP_NET_ADMIN))
++		return -EPERM;
++	if (len > IFNAMSIZ)
++		return -EINVAL;
++	if (!rdev->ops->add_virtual_intf)
++		return -ENOSYS;
++
++	rtnl_lock();
++	res = rdev->ops->add_virtual_intf(&rdev->wiphy, (char*)buf,
++					  NL80211_IFTYPE_UNSPECIFIED,
++					  NULL, NULL);
++	rtnl_unlock();
++
++	return res ? res : len;
++}
++
++static ssize_t _store_remove_iface(struct device *dev,
++				   struct device_attribute *attr,
++				   const char *buf, size_t len)
++{
++	struct cfg80211_registered_device *rdev = dev_to_rdev(dev);
++	int res, ifidx;
++	struct net_device *netdev;
++
++	if (!capable(CAP_NET_ADMIN))
++		return -EPERM;
++	if (len > IFNAMSIZ)
++		return -EINVAL;
++	if (!rdev->ops->del_virtual_intf)
++		return -ENOSYS;
++
++	netdev = dev_get_by_name(&init_net, buf);
++	if (!netdev)
++		return -ENODEV;
++	ifidx = netdev->ifindex;
++	dev_put(netdev);
++
++	rtnl_lock();
++	res = rdev->ops->del_virtual_intf(&rdev->wiphy, ifidx);
++	rtnl_unlock();
++
++	return res ? res : len;
++}
++
+ static struct device_attribute ieee80211_dev_attrs[] = {
+ 	__ATTR(index, S_IRUGO, _show_index, NULL),
+ 	__ATTR(macaddress, S_IRUGO, _show_permaddr, NULL),
++	__ATTR(add_iface, S_IWUGO, NULL, _store_add_iface),
++	__ATTR(remove_iface, S_IWUGO, NULL, _store_remove_iface),
+ 	{}
+ };
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- kernel.spec	22 May 2008 03:38:05 -0000	1.447
+++ kernel.spec	22 May 2008 14:57:45 -0000	1.448
@@ -642,7 +642,8 @@
 Patch681: linux-2.6-wireless-pending.patch
 Patch682: linux-2.6-wireless-fixups.patch
 Patch690: linux-2.6-at76.patch
-Patch693: linux-2.6-zd1211rw-module-alias.patch
+Patch691: linux-2.6-zd1211rw-module-alias.patch
+Patch692: linux-2.6-cfg80211-extras.patch
 
 Patch720: linux-2.6-e1000-corrupt-eeprom-checksum.patch
 Patch721: linux-2.6-netdev-e1000-disable-alpm.patch
@@ -1157,6 +1158,8 @@
 ApplyPatch linux-2.6-wireless-fixups.patch
 # module alias for zd1211rw module
 ApplyPatch linux-2.6-zd1211rw-module-alias.patch
+# Restore ability to add/remove virtual i/fs to mac80211 devices
+ApplyPatch linux-2.6-cfg80211-extras.patch
 
 # Workaround for flaky e1000 EEPROMs
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
@@ -1817,6 +1820,9 @@
 
 
 %changelog
+* Thu May 22 2008 John W. Linville <linville at redhat.com> 2.6.25.4-8
+- Restore ability to add/remove virtual i/fs to mac80211 devices via sysfs
+
 * Wed May 21 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-7
 - Disable CONFIG_PADLOCK_SHA on i686.
 - Package the file modules.order.