SOURCES: rt2400-2.6.29.patch (NEW), kernel-net-ar81-2.6.29.patch (NEW) - ch...

[zbyniu]

Author: zbyniu                       Date: Wed Apr  1 17:13:57 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- changes for .29

---- Files affected:
SOURCES:
   rt2400-2.6.29.patch (NONE -> 1.1)  (NEW), kernel-net-ar81-2.6.29.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rt2400-2.6.29.patch
diff -u /dev/null SOURCES/rt2400-2.6.29.patch:1.1
--- /dev/null	Wed Apr  1 19:13:57 2009
+++ SOURCES/rt2400-2.6.29.patch	Wed Apr  1 19:13:51 2009
@@ -0,0 +1,87 @@
+diff -upr rt2400-1.2.2-cvs-20060911./Module/rtmp_init.c rt2400-1.2.2-cvs-20060911/Module/rtmp_init.c
+--- rt2400-1.2.2-cvs-20060911./Module/rtmp_init.c	2005-11-16 02:07:06.000000000 +0100
++++ rt2400-1.2.2-cvs-20060911/Module/rtmp_init.c	2009-04-01 18:59:08.918706512 +0200
+@@ -1075,15 +1075,29 @@ VOID RTMPReadParametersFromFile(
+ 	INT 					retval, orgfsuid, orgfsgid;
+ 	UINT					Length;
+    	mm_segment_t			orgfs;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++	const struct cred *old_cred;
++	struct cred *new_cred;
++#endif
++
+    	
+    	src = PROFILE_PATH;
+    	Length = sizeof(RTMP_PROFILE_SETTING);
+    	
+ 	// Save uid and gid used for filesystem access.
+ 	// Set user and group to 0 (root)	
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	orgfsuid=current->fsuid;
+ 	orgfsgid=current->fsgid;
+ 	current->fsuid=current->fsgid=0;
++#else
++	new_cred=prepare_creds();
++	if (!new_cred)
++		return -ENOMEM;
++	new_cred->fsuid=0;
++	new_cred->fsgid=0;
++	old_cred=override_creds(new_cred);
++#endif
+     orgfs=get_fs();
+     set_fs(KERNEL_DS);
+ 
+@@ -1145,8 +1159,13 @@ VOID RTMPReadParametersFromFile(
+ 		}
+ 	}
+ 	set_fs(orgfs);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	current->fsuid=orgfsuid;
+ 	current->fsgid=orgfsgid;
++#else
++	revert_creds(old_cred);
++	put_cred(new_cred);
++#endif
+ }	
+ 
+ /*
+Only in rt2400-1.2.2-cvs-20060911/Module: rtmp_init.c~
+diff -upr rt2400-1.2.2-cvs-20060911./Module/rtmp_main.c rt2400-1.2.2-cvs-20060911/Module/rtmp_main.c
+--- rt2400-1.2.2-cvs-20060911./Module/rtmp_main.c	2009-04-01 18:32:49.531392535 +0200
++++ rt2400-1.2.2-cvs-20060911/Module/rtmp_main.c	2009-04-01 18:38:35.492185945 +0200
+@@ -96,7 +96,11 @@ static void
+ rt2x00_get_drvinfo(struct net_device *net_dev,
+ 	struct ethtool_drvinfo *drvinfo)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++	PRTMP_ADAPTER   pAd = net_dev->ml_priv;
++#else
+ 	PRTMP_ADAPTER   pAd = net_dev->priv;
++#endif
+ 
+ 	strcpy(drvinfo->driver, DRV_NAME);
+ 	strcpy(drvinfo->version, DRV_VERSION);
+@@ -113,7 +117,11 @@ static void
+ rt2x00_get_regs(struct net_device *net_dev,
+ 	struct ethtool_regs *regs, void *data)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++	PRTMP_ADAPTER   pAd = net_dev->ml_priv;
++#else
+ 	PRTMP_ADAPTER   pAd = net_dev->priv;
++#endif
+ 	unsigned int counter;
+ 
+ 	regs->len = CSR_REG_SIZE;
+@@ -134,7 +142,11 @@ static int
+ rt2x00_get_eeprom(struct net_device *net_dev,
+ 	struct ethtool_eeprom *eeprom, u8 *data)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++	PRTMP_ADAPTER   pAd = net_dev->ml_priv;
++#else
+ 	PRTMP_ADAPTER   pAd = net_dev->priv;
++#endif
+ 	unsigned int counter;
+ 
+ 	for (counter = eeprom->offset; counter < eeprom->len; counter += sizeof(u16)) {

================================================================
Index: SOURCES/kernel-net-ar81-2.6.29.patch
diff -u /dev/null SOURCES/kernel-net-ar81-2.6.29.patch:1.1
--- /dev/null	Wed Apr  1 19:13:58 2009
+++ SOURCES/kernel-net-ar81-2.6.29.patch	Wed Apr  1 19:13:51 2009
@@ -0,0 +1,38 @@
+--- kernel-net-ar81-1.0.1.0/src/at_main.c.	2009-04-01 18:08:01.041940410 +0200
++++ kernel-net-ar81-1.0.1.0/src/at_main.c	2009-04-01 18:09:13.216350384 +0200
+@@ -858,7 +858,11 @@ at_resume(struct pci_dev *pdev)
+ static pci_ers_result_t at_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
+ {
+     struct net_device *netdev = pci_get_drvdata(pdev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++    struct at_adapter *adapter = netdev->ml_priv;
++#else
+     struct at_adapter *adapter = netdev->priv;
++#endif
+ 
+     netif_device_detach(netdev);
+ 
+@@ -881,7 +885,11 @@ static pci_ers_result_t at_io_error_dete
+ static pci_ers_result_t at_io_slot_reset(struct pci_dev *pdev)
+ {
+     struct net_device *netdev = pci_get_drvdata(pdev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++    struct at_adapter *adapter = netdev->ml_priv;
++#else
+     struct at_adapter *adapter = netdev->priv;
++#endif
+ 
+     if (pci_enable_device(pdev)) {
+         printk(KERN_ERR "ATL1e: Cannot re-enable PCI device after reset.\n");
+@@ -908,7 +916,11 @@ static pci_ers_result_t at_io_slot_reset
+ static void at_io_resume(struct pci_dev *pdev)
+ {
+     struct net_device *netdev = pci_get_drvdata(pdev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++    struct at_adapter *adapter = netdev->ml_priv;
++#else
+     struct at_adapter *adapter = netdev->priv;
++#endif
+ 
+     if (netif_running(netdev)) {
+         if (at_up(adapter)) {
================================================================