revision 3055 committed

Project     : madwifi
Revision    : 3055
Author      : proski (Pavel Roskin)
Date        : 2007-12-13 05:39:11 +0100 (Thu, 13 Dec 2007)

Log Message :
Merge 3038:3054 from trunk

Affected Files:
* madwifi/branches/madwifi-dfs/ath/if_ath_ahb.c       updated             
* madwifi/branches/madwifi-dfs/ath/if_ath_ahb.h       updated             
* madwifi/branches/madwifi-dfs/ath/if_ath_pci.c       updated             
* madwifi/branches/madwifi-dfs/ath/version.h          deleted             
* madwifi/branches/madwifi-dfs/include/compat.h       updated             
* madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c  updated             
* madwifi/branches/madwifi-dfs/net80211/version.h     deleted             


Modified: madwifi/branches/madwifi-dfs/ath/if_ath_ahb.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_ath_ahb.c       2007-12-13 04:34:15 UTC 
(rev 3054)
+++ madwifi/branches/madwifi-dfs/ath/if_ath_ahb.c       2007-12-13 04:39:11 UTC 
(rev 3055)
@@ -250,7 +250,7 @@
        sc->aps_sc.sc_iobase = (void __iomem *) dev->mem_start;
        sc->aps_sc.sc_bdev = NULL;
 
-       if (request_irq(dev->irq, ath_intr, SA_SHIRQ, dev->name, dev)) {
+       if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
                goto bad3;
        }
@@ -306,9 +306,8 @@
 /*
  * Module glue.
  */
-#include "version.h"
 #include "release.h"
-static char *version = ATH_PCI_VERSION " (" RELEASE_VERSION ")";
+static char *version = RELEASE_VERSION;
 static char *dev_info = "ath_ahb";
 
 #include <linux/ethtool.h>

Modified: madwifi/branches/madwifi-dfs/ath/if_ath_ahb.h
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_ath_ahb.h       2007-12-13 04:34:15 UTC 
(rev 3054)
+++ madwifi/branches/madwifi-dfs/ath/if_ath_ahb.h       2007-12-13 04:39:11 UTC 
(rev 3055)
@@ -102,6 +102,15 @@
 
 #define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
 
+/* Allow compiling on non-mips platforms for code verification */
+#ifndef __mips__
+#define CAC_ADDR(addr) (addr)
+#define UNCAC_ADDR(addr) (addr)
+#define KSEG1ADDR(addr) (addr)
+#define dma_cache_wback_inv(start,size)        \
+       do { (void) (start); (void) (size); } while (0)
+#endif
+
 /* set bus cachesize in 4B word units */
 static __inline void bus_dma_sync_single(void *hwdev, dma_addr_t dma_handle,
        size_t size, int direction)
@@ -135,11 +144,4 @@
 
 #define sysRegRead(phys)      (*(volatile u_int32_t *)phys)
 
-/* Allow compiling on non-mips platforms for code verification */
-#ifndef __mips__
-#define CAC_ADDR(addr) (addr)
-#define UNCAC_ADDR(addr) (addr)
-#define KSEG1ADDR(addr) (addr)
-#endif
-
 #endif    /* _DEV_ATH_AHB_H_ */

Modified: madwifi/branches/madwifi-dfs/ath/if_ath_pci.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_ath_pci.c       2007-12-13 04:34:15 UTC 
(rev 3054)
+++ madwifi/branches/madwifi-dfs/ath/if_ath_pci.c       2007-12-13 04:39:11 UTC 
(rev 3055)
@@ -205,12 +205,7 @@
 
        pci_set_drvdata(pdev, dev);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
        if (request_irq(dev->irq, ath_intr, IRQF_SHARED, dev->name, dev)) {
-#else
-       if (request_irq(dev->irq, ath_intr, SA_SHIRQ, dev->name, dev)) {
-#endif
-
                printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
                goto bad3;
        }
@@ -343,9 +338,8 @@
 /*
  * Module glue.
  */
-#include "version.h"
 #include "release.h"
-static char *version = ATH_PCI_VERSION " (" RELEASE_VERSION ")";
+static char *version = RELEASE_VERSION;
 static char *dev_info = "ath_pci";
 
 #include <linux/ethtool.h>

Deleted: madwifi/branches/madwifi-dfs/ath/version.h

Modified: madwifi/branches/madwifi-dfs/include/compat.h
===================================================================
--- madwifi/branches/madwifi-dfs/include/compat.h       2007-12-13 04:34:15 UTC 
(rev 3054)
+++ madwifi/branches/madwifi-dfs/include/compat.h       2007-12-13 04:39:11 UTC 
(rev 3055)
@@ -144,6 +144,10 @@
 }
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#define IRQF_SHARED SA_SHIRQ
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 #define skb_end_pointer(_skb) ((_skb)->end)
 #define skb_tail_pointer(_skb) ((_skb)->tail)

Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c     2007-12-13 
04:34:15 UTC (rev 3054)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c     2007-12-13 
04:39:11 UTC (rev 3055)
@@ -992,9 +992,8 @@
 /*
  * Module glue.
  */
-#include "version.h"
 #include "release.h"
-static char *version = WLAN_VERSION " (" RELEASE_VERSION ")";
+static char *version = RELEASE_VERSION;
 static char *dev_info = "wlan";
 
 MODULE_AUTHOR("Errno Consulting, Sam Leffler");

Deleted: madwifi/branches/madwifi-dfs/net80211/version.h

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace