rpms/kernel/devel linux-2.6-phy-ioctl-fix.patch, NONE, 1.1 kernel.spec, 1.259, 1.260

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-phy-ioctl-fix.patch 
Log Message:
stop phy code from confusing installer by pretending to be wireless

linux-2.6-phy-ioctl-fix.patch:

--- NEW FILE linux-2.6-phy-ioctl-fix.patch ---
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 9bc1177..7c9e6e3 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -406,6 +406,9 @@ int phy_mii_ioctl(struct phy_device *phydev,
 				&& phydev->drv->config_init)
 			phydev->drv->config_init(phydev);
 		break;
+
+	default:
+		return -ENOTTY;
 	}
 
 	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- kernel.spec	28 Nov 2007 17:55:27 -0000	1.259
+++ kernel.spec	28 Nov 2007 19:59:36 -0000	1.260
@@ -630,6 +630,7 @@
 Patch1520: linux-2.6-dcdbas-autoload.patch
 Patch1530: linux-2.6-fix-kd.h.patch
 Patch1540: linux-2.6-fec_mpc52xx-fix.patch
+Patch1550: linux-2.6-phy-ioctl-fix.patch
 
 Patch1600: linux-2.6-usb-storage-always-set-the-allow_restart-flag.patch
 
@@ -1146,6 +1147,9 @@
 # Fix fec_mpc52xx not to corrupt memory
 ApplyPatch linux-2.6-fec_mpc52xx-fix.patch
 
+# Fix generic PHY code not to pretend to be wireless
+ApplyPatch linux-2.6-phy-ioctl-fix.patch
+
 # some usb disks spin down automatically and need allow_restart
 ApplyPatch linux-2.6-usb-storage-always-set-the-allow_restart-flag.patch
 
@@ -1715,6 +1719,9 @@
 
 %changelog
 * Wed Nov 28 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix phy code to not return success to unknown ioctls
+
+* Wed Nov 28 2007 David Woodhouse <dwmw2 at redhat.com>
 - Fix net: symlink in sysfs for fec_mpc52xx
 
 * Wed Nov 28 2007 Kyle McMartin <kmcmartin at redhat.com>