rpms/kernel/devel at76-netdev_ops.patch, NONE, 1.1 rds-only-on-64-bit-or-x86.patch, NONE, 1.1 kernel.spec, 1.1495, 1.1496

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23036

Modified Files:
	kernel.spec 
Added Files:
	at76-netdev_ops.patch rds-only-on-64-bit-or-x86.patch 
Log Message:
* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
- rds-only-on-64-bit-or-x86.patch: add
- at76-netdev_ops.patch: add


at76-netdev_ops.patch:

--- NEW FILE at76-netdev_ops.patch ---
diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c
index c8e4d31..59071e6 100644
--- a/drivers/staging/at76_usb/at76_usb.c
+++ b/drivers/staging/at76_usb/at76_usb.c
@@ -5259,6 +5259,18 @@ static int at76_alloc_urbs(struct at76_priv *priv,
 	return 0;
 }
 
+static const struct net_device_ops at76_netdev_ops = {
+	.ndo_open 		= at76_open,
+	.ndo_stop		= at76_stop,
+	.ndo_get_stats		= at76_get_stats,
+	.ndo_start_xmit		= at76_tx,
+	.ndo_tx_timeout		= at76_tx_timeout,
+	.ndo_set_multicast_list	= at76_set_multicast,
+	.ndo_set_mac_address	= at76_set_mac_address,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 /* Register network device and initialize the hardware */
 static int at76_init_new_device(struct at76_priv *priv,
 				struct usb_interface *interface)
@@ -5303,22 +5315,18 @@ static int at76_init_new_device(struct at76_priv *priv,
 	priv->scan_mode = SCAN_TYPE_ACTIVE;
 
 	netdev->flags &= ~IFF_MULTICAST;	/* not yet or never */
-	netdev->open = at76_open;
-	netdev->stop = at76_stop;
-	netdev->get_stats = at76_get_stats;
+
+	netdev->netdev_ops = &at76_netdev_ops;
 	netdev->ethtool_ops = &at76_ethtool_ops;
 
+	dev_alloc_name(netdev, "wlan%d");
+
 	/* Add pointers to enable iwspy support. */
 	priv->wireless_data.spy_data = &priv->spy_data;
 	netdev->wireless_data = &priv->wireless_data;
 
-	netdev->hard_start_xmit = at76_tx;
-	netdev->tx_timeout = at76_tx_timeout;
 	netdev->watchdog_timeo = 2 * HZ;
 	netdev->wireless_handlers = &at76_handler_def;
-	netdev->set_multicast_list = at76_set_multicast;
-	netdev->set_mac_address = at76_set_mac_address;
-	dev_alloc_name(netdev, "wlan%d");
 
 	ret = register_netdev(priv->netdev);
 	if (ret) {

rds-only-on-64-bit-or-x86.patch:

--- NEW FILE rds-only-on-64-bit-or-x86.patch ---
diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index 796773b..29811ac 100644
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -1,7 +1,7 @@
 
 config RDS
 	tristate "Reliable Datagram Sockets (RDS) (EXPERIMENTAL)"
-	depends on INET && INFINIBAND_IPOIB && EXPERIMENTAL
+	depends on INET && INFINIBAND_IPOIB && EXPERIMENTAL && (X86 || 64BIT)
 	depends on INFINIBAND && INFINIBAND_ADDR_TRANS
 	---help---
 	  RDS provides reliable, sequenced delivery of datagrams


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1495
retrieving revision 1.1496
diff -u -r1.1495 -r1.1496
--- kernel.spec	31 Mar 2009 20:20:35 -0000	1.1495
+++ kernel.spec	31 Mar 2009 21:12:54 -0000	1.1496
@@ -598,6 +598,8 @@
 Patch31: dma-api-debug-fixes.patch
 Patch41: linux-2.6-sysrq-c.patch
 
+Patch50: rds-only-on-64-bit-or-x86.patch
+
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
@@ -650,6 +652,7 @@
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
 Patch682: linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 Patch683: fix-staging-at76.patch
+Patch684: at76-netdev_ops.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 
@@ -1099,6 +1102,8 @@
 # enable sysrq-c on all kernels, not only kexec
 ApplyPatch linux-2.6-sysrq-c.patch
 
+ApplyPatch rds-only-on-64-bit-or-x86.patch
+
 # Architecture patches
 # x86(-64)
 
@@ -1238,6 +1243,7 @@
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
 #ApplyPatch linux-2.6-ipw2x00-age-scan-results-on-resume.patch
 ApplyPatch fix-staging-at76.patch
+ApplyPatch at76-netdev_ops.patch
 
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
@@ -1883,6 +1889,10 @@
 #	                ||     ||
 %changelog
 * Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
+- rds-only-on-64-bit-or-x86.patch: add
+- at76-netdev_ops.patch: add
+
+* Tue Mar 31 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.29-git8
 - linux-2.6-net-fix-another-gro-bug.patch: upstream.