Changeset 3704

Timestamp:
06/05/08 09:41:27 (2 weeks ago)
Author:
proski
Message:

Merge changes from trunk up to r3703

Files:
  • madwifi/branches/madwifi-hal-0.10.5.6 (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_hal (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/ah_os.h (modified) (2 diffs)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/amrr (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/amrr/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/minstrel (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/minstrel/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/onoe (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/onoe/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/sample (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/sample/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/net80211 (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/net80211/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/ccmp (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/ccmp/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/tkip (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/tkip/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/tkip/test_tkip.c (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/wep (modified) (1 prop)
  • madwifi/branches/madwifi-hal-0.10.5.6/regression/wep/Makefile (modified) (1 diff)
  • madwifi/branches/madwifi-hal-0.10.5.6/tools (modified) (1 prop)

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • madwifi/branches/madwifi-hal-0.10.5.6

    • Property svn:ignore changed from
      *.symvers
      .tmp_versions
      svnversion.h
       to
      *.symvers
      .tmp_versions
      modules.order
      svnversion.h

  • madwifi/branches/madwifi-hal-0.10.5.6/Makefile

    r3678 r3704  
    130 130         -$(MAKE) -C $(TOOLS) clean 
    131 131         rm -rf .tmp_versions 
    132           rm -f *.symvers svnversion.h 
      132         rm -f *.symvers svnversion.h 
    133 133  
    134 134 .PHONY: info 

  • madwifi/branches/madwifi-hal-0.10.5.6/ath

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/ath/Makefile

    r3678 r3704  
    78 78 clean: 
    79 79         rm -f *~ *.o *.ko *.mod.c .*.cmd 
    80           rm -f .depend .version .*.o.flags .*.o.d 
      80         rm -f .depend .version .*.o.flags .*.o.d 
    81 81         rm -rf .tmp_versions 
    82 82  

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_hal

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
      uudecode
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order
      uudecode

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/Makefile

    r3678 r3704  
    103 103 clean: 
    104 104         rm -f *~ *.o *.ko *.mod.c uudecode .*.cmd 
    105           rm -f .depend .version .*.o.flags .*.o.d 
      105         rm -f .depend .version .*.o.flags .*.o.d 
    106 106         rm -rf .tmp_versions 
    107 107  

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/ah_os.h

    r3600 r3704  
    188 188  */ 
    189 189 #if (AH_BYTE_ORDER == AH_BIG_ENDIAN) 
    190   #define is_reg_le(__reg) ((0x4000 <= (__reg) && (__reg) < 0x5000)) 
    191   #else 
    192   #define is_reg_le(__reg) 1 
    193   #endif 
    194    
      190 #define is_reg_le(__reg) ((0x4000 <= (__reg) && (__reg) < 0x5000) || \ 
      191                           (0x7000 <= (__reg) && (__reg) < 0x8000)) 
    195 192 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) 
    196 193 #define _OS_REG_WRITE(_ah, _reg, _val) do {                     \ 
    … …  
    214 211          cpu_to_le32(readl((_ah)->ah_sh + (_reg)))) 
    215 212 #endif                          /* KERNEL_VERSION(2,6,12) */ 
      213  
      214  
      215  
      216  
      217  
      218  
      219  
      220  
      221  
      222  
      223  
      224  
      225  
      226  
      227  
    216 228  
    217 229 #define HAL_DEBUG_OFF                   0 

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate

    • Property svn:ignore set to
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/Makefile

    r3678 r3704  
    27 27                 $(MAKE) -C $$i clean; \ 
    28 28         done 
      29  
      30  

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/amrr

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/amrr/Makefile

    r3678 r3704  
    67 67 clean: 
    68 68         -rm -f *~ *.o *.ko *.mod.c 
    69           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      69         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    70 70         -rm -rf .tmp_versions 
    71 71  

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/minstrel

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/minstrel/Makefile

    r3678 r3704  
    65 65 clean: 
    66 66         -rm -f *~ *.o *.ko *.mod.c 
    67           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      67         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    68 68         -rm -rf .tmp_versions 
    69 69  

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/onoe

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/onoe/Makefile

    r3678 r3704  
    67 67 clean: 
    68 68         -rm -f *~ *.o *.ko *.mod.c 
    69           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      69         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    70 70         -rm -rf .tmp_versions 
    71 71  

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/sample

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/ath_rate/sample/Makefile

    r3678 r3704  
    65 65 clean: 
    66 66         -rm -f *~ *.o *.ko *.mod.c 
    67           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      67         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    68 68         -rm -rf .tmp_versions 
    69 69  

  • madwifi/branches/madwifi-hal-0.10.5.6/net80211

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/net80211/Makefile

    r3678 r3704  
    115 115 clean: 
    116 116         -rm -f *~ *.o *.ko *.mod.c 
    117           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      117         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    118 118         -rm -rf .tmp_versions 

  • madwifi/branches/madwifi-hal-0.10.5.6/regression

    • Property svn:ignore set to
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/Makefile

    r3603 r3704  
    24 24                 $(MAKE) -C $$i clean; \ 
    25 25         done 
      26  
      27  
      28  

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/ccmp

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/ccmp/Makefile

    r3603 r3704  
    25 25 clean: 
    26 26         -rm -f *~ *.o *.ko *.mod.c 
    27           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      27         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    28 28         -rm -rf .tmp_versions 
    29 29  

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/tkip

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/tkip/Makefile

    r3603 r3704  
    25 25 clean: 
    26 26         -rm -f *~ *.o *.ko *.mod.c 
    27           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      27         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    28 28         -rm -rf .tmp_versions 
    29 29  

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/tkip/test_tkip.c

    r2990 r3704  
    330 330          * De-MIC decrypted frame. 
    331 331          */ 
    332           if (!ieee80211_crypto_demic(vap, key, skb, hdrlen)) { 
      332         if (!ieee80211_crypto_demic(vap, key, skb, hdrlen)) { 
    333 333                 printk("FAIL: tkip demic failed\n"); 
    334 334                 goto bad; 

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/wep

    • Property svn:ignore changed from
      .*.cmd
      .*.flags
      *.o
      *.ko
      *.mod.c
       to
      *.ko
      *.mod.c
      *.o
      .*.cmd
      .*.flags
      modules.order

  • madwifi/branches/madwifi-hal-0.10.5.6/regression/wep/Makefile

    r3603 r3704  
    25 25 clean: 
    26 26         -rm -f *~ *.o *.ko *.mod.c 
    27           -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
      27         -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd 
    28 28         -rm -rf .tmp_versions 
    29 29  

  • madwifi/branches/madwifi-hal-0.10.5.6/tools

    • Property svn:ignore changed from
      80211debug
      80211stats
      athchans
      athctrl
      athdebug
      athkey
      athstats
      wlanconfig
       to
      80211debug
      80211stats
      athchans
      athctrl
      athdebug
      athkey
      athstats
      wlanconfig
      wpakey