mirrors
/
madwifi
mirror of https://github.com/proski/madwifi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge some whitespace changes from the DFS branch 

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2864 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2007-11-20 17:18:36 +00:00
parent 4e9cfeafe3
commit a08cab1f36
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ath/if_ath_pci.h
View File

@ -50,8 +50,8 @@
#define PCI_RESTORE_STATE(a,b) pci_restore_state(a)
#else
#define bus_dma_sync_single pci_dma_sync_single
#define PCI_SAVE_STATE(a,b) pci_save_state(a,b)
#define PCI_RESTORE_STATE(a,b) pci_restore_state(a,b)
#define PCI_SAVE_STATE(a,b) pci_save_state(a, b)
#define PCI_RESTORE_STATE(a,b) pci_restore_state(a, b)
#endif
#define bus_alloc_consistent pci_alloc_consistent

10
net80211/ieee80211_linux.h
View File

@ -88,7 +88,7 @@ set_quality(struct iw_quality *iq, u_int rssi, int noise)
#include <linux/interrupt.h>
#ifdef DECLARE_TASKLET /* native tasklets */
#define IEEE80211_TQ_STRUCT tasklet_struct
#define IEEE80211_INIT_TQUEUE(a,b,c) tasklet_init((a),(b),(unsigned long)(c))
#define IEEE80211_INIT_TQUEUE(a,b,c) tasklet_init((a), (b), (unsigned long)(c))
#define IEEE80211_SCHEDULE_TQUEUE(a) tasklet_schedule((a))
#define IEEE80211_CANCEL_TQUEUE(a) if (!in_interrupt()) tasklet_kill((a))
typedef unsigned long IEEE80211_TQUEUE_ARG;
@ -106,7 +106,7 @@ typedef void *IEEE80211_TQUEUE_ARG;
#define tasklet_disable(t) do { (void) t; local_bh_disable(); } while (0)
#define tasklet_enable(t) do { (void) t; local_bh_enable(); } while (0)
/* XXX: not supporting cancel in old kernels! */
#define IEEE80211_CANCEL_TQUEUE(a) ((a),0)
#define IEEE80211_CANCEL_TQUEUE(a) ((a), 0)
#endif /* !DECLARE_TASKLET */
#define IEEE80211_RESCHEDULE schedule
@ -137,7 +137,7 @@ typedef spinlock_t ieee80211com_lock_t;
#if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)) && defined(spin_is_locked)
#define IEEE80211_LOCK_ASSERT(_ic) \
KASSERT(spin_is_locked(&(_ic)->ic_comlock),("ieee80211com not locked!"))
KASSERT(spin_is_locked(&(_ic)->ic_comlock), ("ieee80211com not locked!"))
#else
#define IEEE80211_LOCK_ASSERT(_ic)
#endif
@ -254,7 +254,7 @@ typedef spinlock_t acl_lock_t;
/* __skb_append got a third parameter in 2.6.14 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
#define __skb_append(a,b,c) __skb_append(a,b)
#define __skb_append(a,b,c) __skb_append(a, b)
#endif
/*
@ -410,7 +410,7 @@ extern const char *ether_sprintf(const u_int8_t *);
* Queue write-arounds and support routines.
*/
extern struct sk_buff *ieee80211_getmgtframe(u_int8_t **frm, u_int pktlen);
#define IF_ENQUEUE(_q,_skb) skb_queue_tail(_q,_skb)
#define IF_ENQUEUE(_q,_skb) skb_queue_tail(_q, _skb)
#define IF_DEQUEUE(_q,_skb) (_skb = skb_dequeue(_q))
#define _IF_QLEN(_q) skb_queue_len(_q)
#define IF_DRAIN(_q) skb_queue_drain(_q)

2
net80211/ieee80211_power.c
View File

@ -82,7 +82,7 @@ ieee80211_power_latevattach(struct ieee80211vap *vap)
* know adhoc mode doesn't support ATIM yet...
*/
if (vap->iv_opmode == IEEE80211_M_HOSTAP) {
vap->iv_tim_len = howmany(vap->iv_max_aid,8) * sizeof(u_int8_t);
vap->iv_tim_len = howmany(vap->iv_max_aid, 8) * sizeof(u_int8_t);
MALLOC(vap->iv_tim_bitmap, u_int8_t *, vap->iv_tim_len,
M_DEVBUF, M_NOWAIT | M_ZERO);
if (vap->iv_tim_bitmap == NULL) {

6
net80211/if_media.h
View File

@ -367,9 +367,9 @@ struct ifmedia_description {
#define IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS { \
{ IFM_TOK_ETR, "EarlyTokenRelease" }, \
{ IFM_TOK_SRCRT, "SourceRouting" }, \
{ IFM_TOK_ALLR, "AllRoutes" }, \
{ IFM_TOK_DTR, "Dedicated" }, \
{ IFM_TOK_CLASSIC,"Classic" }, \
{ IFM_TOK_ALLR, "AllRoutes" }, \
{ IFM_TOK_DTR, "Dedicated" }, \
{ IFM_TOK_CLASSIC, "Classic" }, \
{ IFM_TOK_AUTO, " " }, \
{ 0, NULL }, \
}