rpms/kernel/devel linux-2.6-ps3-usb-autoload.patch, NONE, 1.1 kernel-2.6.spec, 1.3062, 1.3063 linux-2.6-ps3-ethernet.patch, 1.1, 1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 13 13:16:55 UTC 2007


Author: dwmw2

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

Modified Files:
	kernel-2.6.spec linux-2.6-ps3-ethernet.patch 
Added Files:
	linux-2.6-ps3-usb-autoload.patch 
Log Message:
fix PS3 IPv6, and USB autoload

linux-2.6-ps3-usb-autoload.patch:
 ehci-ps3.c |    1 +
 ohci-ps3.c |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE linux-2.6-ps3-usb-autoload.patch ---
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 4d781a2..fe485a0 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -182,6 +182,7 @@ static int ps3_ehci_sb_remove(struct ps3_system_bus_device *dev)
 }
 
 MODULE_ALIAS("ps3-ehci");
+MODULE_ALIAS("ps3:1");
 
 static struct ps3_system_bus_driver ps3_ehci_sb_driver = {
 	.match_id = PS3_MATCH_ID_EHCI,
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 62283a3..1004d91 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -185,6 +185,7 @@ static int ps3_ohci_sb_remove (struct ps3_system_bus_device *dev)
 }
 
 MODULE_ALIAS("ps3-ohci");
+MODULE_ALIAS("ps3:2");
 
 static struct ps3_system_bus_driver ps3_ohci_sb_driver = {
 	.match_id = PS3_MATCH_ID_OHCI,


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3062
retrieving revision 1.3063
diff -u -r1.3062 -r1.3063
--- kernel-2.6.spec	12 Apr 2007 21:26:01 -0000	1.3062
+++ kernel-2.6.spec	13 Apr 2007 13:16:51 -0000	1.3063
@@ -446,6 +446,7 @@
 Patch364: linux-2.6-ps3-exports.patch
 Patch365: linux-2.6-ps3-ethernet-autoload.patch
 Patch366: linux-2.6-ps3av-export-header.patch
+Patch367: linux-2.6-ps3-usb-autoload.patch
 
 # 500 - 599   s390(x)
 
@@ -1064,6 +1065,7 @@
 %patch364 -p1
 %patch365 -p1
 %patch366 -p1
+%patch367 -p1
 
 # S390
 
@@ -2256,6 +2258,9 @@
 #  - tux.
 
 %changelog
+* Fri Apr 13 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix PS3 Ethernet IPv6 checksum problems, autoload PS3 USB modules
+
 * Thu Apr 12 2007 Kristian Høgsberg <krh at redhat.com>
 - Add a few more firewire bug fixes, incorporate last couple of
   changes to userspace interface.

linux-2.6-ps3-ethernet.patch:
 drivers/net/Makefile                  |    1 
 ps3-linux-dev/drivers/net/Kconfig     |   10 
 ps3-linux-dev/drivers/net/gelic_net.c | 1877 ++++++++++++++++++++++++++++++++++
 3 files changed, 1888 insertions(+)

Index: linux-2.6-ps3-ethernet.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ps3-ethernet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ps3-ethernet.patch	30 Mar 2007 20:10:34 -0000	1.1
+++ linux-2.6-ps3-ethernet.patch	13 Apr 2007 13:16:51 -0000	1.2
@@ -1542,16 +1542,16 @@
 +static uint32_t
 +gelic_net_get_tx_csum(struct net_device *netdev)
 +{
-+	return (netdev->features & NETIF_F_HW_CSUM) != 0;
++	return (netdev->features & NETIF_F_IP_CSUM) != 0;
 +}
 +
 +static int
 +gelic_net_set_tx_csum(struct net_device *netdev, uint32_t data)
 +{
 +	if (data)
-+		netdev->features |= NETIF_F_HW_CSUM;
++		netdev->features |= NETIF_F_IP_CSUM;
 +	else
-+		netdev->features &= ~NETIF_F_HW_CSUM;
++		netdev->features &= ~NETIF_F_IP_CSUM;
 +
 +	return 0;
 +}
@@ -1730,7 +1730,7 @@
 +
 +	gelic_net_setup_netdev_ops(netdev);
 +
-+	netdev->features = NETIF_F_HW_CSUM;
++	netdev->features = NETIF_F_IP_CSUM;
 +
 +	status = lv1_net_control(card->dev->did.bus_id, card->dev->did.dev_id,
 +				GELIC_NET_GET_MAC_ADDRESS,




More information about the fedora-cvs-commits mailing list