source: trunk/package/madwifi/patches/200-no_debug.patch @ 7309

Last change on this file since 7309 was 7309, checked in by nbd, 9 years ago

update madwifi to latest trunk (refcount and hal-0.9.30.13 got merged) and include a security fix that was merged in 0.9.3.1

  • Property svn:eol-style set to native
File size: 5.5 KB
  • ath/if_ath.c

    diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
    old new  
    7575#include <net80211/if_llc.h> 
    7676#endif 
    7777 
    78 #define AR_DEBUG 
     78#undef  AR_DEBUG 
    7979 
    8080#include "net80211/if_athproto.h" 
    8181#include "if_athvar.h" 
     
    356356                ath_keyprint(sc, __func__, ix, hk, mac);        \ 
    357357} while (0) 
    358358#else /* defined(AR_DEBUG) */ 
    359 #define IFF_DUMPPKTS(sc, _m)    netif_msg_dumppkts(&sc->sc_ic) 
     359#define IFF_DUMPPKTS(sc, _m)    0 
    360360#define DPRINTF(sc, _m, _fmt, ...) 
    361361#define KEYPRINTF(sc, k, ix, mac) 
    362362#endif /* defined(AR_DEBUG) */ 
  • ath_rate/amrr/amrr.c

    diff -ur madwifi.old/ath_rate/amrr/amrr.c madwifi.dev/ath_rate/amrr/amrr.c
    old new  
    6969 
    7070#include "amrr.h" 
    7171 
    72 #define AMRR_DEBUG 
     72#undef  AMRR_DEBUG 
    7373#ifdef AMRR_DEBUG 
    7474#define DPRINTF(sc, _fmt, ...) do {                                     \ 
    7575        if (sc->sc_debug & 0x10)                                        \ 
  • ath_rate/minstrel/minstrel.c

    diff -ur madwifi.old/ath_rate/minstrel/minstrel.c madwifi.dev/ath_rate/minstrel/minstrel.c
    old new  
    116116 
    117117#include "minstrel.h" 
    118118 
    119 #define MINSTREL_DEBUG  
     119#undef  MINSTREL_DEBUG  
    120120#ifdef MINSTREL_DEBUG 
    121121enum { 
    122122        ATH_DEBUG_RATE          = 0x00000010    /* rate control */ 
  • ath_rate/onoe/onoe.c

    diff -ur madwifi.old/ath_rate/onoe/onoe.c madwifi.dev/ath_rate/onoe/onoe.c
    old new  
    6565 
    6666#include "onoe.h" 
    6767 
    68 #define ONOE_DEBUG 
     68#undef  ONOE_DEBUG 
    6969#ifdef ONOE_DEBUG 
    7070enum { 
    7171        ATH_DEBUG_RATE  = 0x00000010,   /* rate control */ 
  • ath_rate/sample/sample.c

    diff -ur madwifi.old/ath_rate/sample/sample.c madwifi.dev/ath_rate/sample/sample.c
    old new  
    6767 
    6868#include "sample.h" 
    6969 
    70 #define SAMPLE_DEBUG 
     70#undef  SAMPLE_DEBUG 
    7171#ifdef SAMPLE_DEBUG 
    7272enum { 
    7373        ATH_DEBUG_NODE          = 0x00080000,   /* node management */ 
  • net80211/ieee80211_proto.c

    diff -ur madwifi.old/net80211/ieee80211_proto.c madwifi.dev/net80211/ieee80211_proto.c
    old new  
    312312} 
    313313EXPORT_SYMBOL(ieee80211_print_essid); 
    314314 
     315#ifdef IEEE80211_DEBUG 
    315316void 
    316317ieee80211_dump_pkt(struct ieee80211com *ic, 
    317318        const u_int8_t *buf, int len, int rate, int rssi) 
     
    390391        } 
    391392} 
    392393EXPORT_SYMBOL(ieee80211_dump_pkt); 
     394#endif /* IEEE80211_DEBUG */ 
    393395 
    394396int 
    395397ieee80211_fix_rate(struct ieee80211_node *ni, int flags) 
  • net80211/ieee80211_proto.h

    diff -ur madwifi.old/net80211/ieee80211_proto.h madwifi.dev/net80211/ieee80211_proto.h
    old new  
    247247#endif 
    248248int ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int); 
    249249void ieee80211_print_essid(const u_int8_t *, int); 
     250#ifdef IEEE80211_DEBUG 
    250251void ieee80211_dump_pkt(struct ieee80211com *, const u_int8_t *, int, int, int); 
     252#else 
     253#define ieee80211_dump_pkt(...) 
     254#endif 
    251255struct sk_buff *ieee80211_getcfframe(struct ieee80211vap *, int); 
    252256 
    253257/* 
  • net80211/ieee80211_var.h

    diff -ur madwifi.old/net80211/ieee80211_var.h madwifi.dev/net80211/ieee80211_var.h
    old new  
    3535#ifndef _NET80211_IEEE80211_VAR_H_ 
    3636#define _NET80211_IEEE80211_VAR_H_ 
    3737 
    38 #define IEEE80211_DEBUG 
    39 #define IEEE80211_DEBUG_REFCNT                  /* Node reference count debugging */ 
     38#undef  IEEE80211_DEBUG 
     39#undef  IEEE80211_DEBUG_REFCNT                  /* Node reference count debugging */ 
    4040 
    4141/* Definitions for IEEE 802.11 drivers. */ 
    4242#include <net80211/ieee80211_linux.h> 
  • tools/do_multi.c

    diff -ur madwifi.old/tools/do_multi.c madwifi.dev/tools/do_multi.c
    old new  
    99 
    1010    progname = basename(argv[0]); 
    1111 
     12#if 0 
    1213    if(strcmp(progname, "80211debug") == 0) 
    1314        ret = a80211debug_init(argc, argv); 
     15#endif 
    1416    if(strcmp(progname, "80211stats") == 0) 
    1517        ret = a80211stats_init(argc, argv); 
    1618    if(strcmp(progname, "athchans") == 0) 
    1719        ret = athchans_init(argc, argv); 
    1820    if(strcmp(progname, "athctrl") == 0) 
    1921        ret =  athctrl_init(argc, argv); 
     22#if 0 
    2023    if(strcmp(progname, "athdebug") == 0) 
    2124        ret =  athdebug_init(argc, argv); 
     25#endif 
    2226    if(strcmp(progname, "athkey") == 0) 
    2327        ret =  athkey_init(argc, argv); 
    2428    if(strcmp(progname, "athstats") == 0) 
  • tools/Makefile

    diff -ur madwifi.old/tools/Makefile madwifi.dev/tools/Makefile
    old new  
    5252         
    5353ifdef DOMULTI 
    5454OBJS=   do_multi.o athstats.o 80211stats.o athkey.o athchans.o athctrl.o \ 
    55         athdebug.o 80211debug.o wlanconfig.o  
     55        wlanconfig.o  
    5656ALL=    ${OBJS} madwifi_multi 
    5757endif 
    5858 
     
    8585        ${CC} -c -o do_multi.o -DDOMULTI=1 ${ALL_CFLAGS} do_multi.c 
    8686madwifi_multi: 
    8787        ${CC} -o madwifi_multi ${LDFLAGS} ${OBJS} 
    88         for i in athstats 80211stats athkey athchans athctrl athdebug wlanconfig 80211debug; do \ 
     88        for i in athstats 80211stats athkey athchans athctrl wlanconfig; do \ 
    8989        ln -s -f madwifi_multi $$i; \ 
    9090        done 
    9191 
Note: See TracBrowser for help on using the repository browser.