[Madwifi-cvs] revision 4174 committed
Status: Beta
Brought to you by:
otaku
Menu
▾
▴
[Madwifi-cvs] revision 4174 committed
|
From: Pavel R. <svn...@ma...> - 2011-10-25 21:38:21
|
Project : madwifi
Revision : 4174
Author : proski (Pavel Roskin)
Date : 2011-10-25 23:38:00 +0200 (Tue, 25 Oct 2011)
Log Message :
Merge 4149:4172 from trunk
Affected Files:
* madwifi/branches/madwifi-dfs/Makefile.inc updated
* madwifi/branches/madwifi-dfs/ath/if_ath.c updated
* madwifi/branches/madwifi-dfs/ath/if_ath_pci.c updated
* madwifi/branches/madwifi-dfs/ath/if_ath_radar.c updated
* madwifi/branches/madwifi-dfs/ath/if_athvar.h updated
* madwifi/branches/madwifi-dfs/ath_hal/ah.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ah_os.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c updated
* madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h updated
* madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c updated
* madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c updated
* madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c updated
* madwifi/branches/madwifi-dfs/include/compat.h updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211.c updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h updated
* madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c updated
* madwifi/branches/madwifi-dfs/net80211/if_media.c updated
* madwifi/branches/madwifi-dfs/tools/wireless_copy.h updated
Modified: madwifi/branches/madwifi-dfs/Makefile.inc
===================================================================
--- madwifi/branches/madwifi-dfs/Makefile.inc 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/Makefile.inc 2011-10-25 21:38:00 UTC (rev 4174)
@@ -134,7 +134,7 @@
#
TOOLS= $(TOP)/tools
-WARNINGS = -Werror -Wall
+WARNINGS = -Wall
COPTS+= $(WARNINGS)
INCS= -include $(TOP)/include/compat.h -I$(TOP)/include
Modified: madwifi/branches/madwifi-dfs/ath/if_ath.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -1409,12 +1409,10 @@
/* If no default VAP debug flags are passed, allow a few to
* transfer down from the driver to new VAPs so we can have load
* time debugging for VAPs too. */
- vap->iv_debug = 0 |
- ((sc->sc_debug & ATH_DEBUG_RATE) ? IEEE80211_MSG_XRATE : 0) |
- ((sc->sc_debug & ATH_DEBUG_XMIT) ? IEEE80211_MSG_OUTPUT : 0) |
- ((sc->sc_debug & ATH_DEBUG_RECV) ? IEEE80211_MSG_INPUT : 0) |
- 0
- ;
+ vap->iv_debug =
+ ((sc->sc_debug & ATH_DEBUG_RATE) ? IEEE80211_MSG_XRATE : 0) |
+ ((sc->sc_debug & ATH_DEBUG_XMIT) ? IEEE80211_MSG_OUTPUT : 0) |
+ ((sc->sc_debug & ATH_DEBUG_RECV) ? IEEE80211_MSG_INPUT : 0);
}
ic->ic_debug = (sc->sc_default_ieee80211_debug & IEEE80211_MSG_IC);
@@ -1519,7 +1517,9 @@
}
if (sc->sc_hastsfadd)
ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons);
- SET_NETDEV_DEV(dev, ATH_GET_NETDEV_DEV(mdev));
+#ifdef ATH_PCI
+ SET_NETDEV_DEV(dev, &((struct pci_dev *)sc->sc_bdev)->dev);
+#endif
/* complete setup */
(void) ieee80211_vap_attach(vap,
ieee80211_media_change, ieee80211_media_status);
@@ -1824,8 +1824,8 @@
return ret;
/* Do the same as in ath_getchannels() */
- ath_radar_correct_dfs_flags(sc, channel);
-
+ ath_radar_correct_dfs_flags(sc, channel);
+
/* Restore CHANNEL_DFS_CLEAR and CHANNEL_INTERFERENCE flags */
#define CHANNEL_DFS_FLAGS (CHANNEL_DFS_CLEAR|CHANNEL_INTERFERENCE)
channel->privFlags = (channel->privFlags & ~CHANNEL_DFS_FLAGS) |
@@ -2720,7 +2720,7 @@
struct ath_softc *sc = netdev_priv(dev);
if (time_before(jiffies, sc->sc_ic.ic_bmiss_guard)) {
- /* Beacon miss interrupt occured too short after last beacon
+ /* Beacon miss interrupt occurred too short after last beacon
* timer configuration. Ignore it as it could be spurious. */
DPRINTF(sc, ATH_DEBUG_ANY, "Beacon miss ignored\n");
} else {
@@ -5244,12 +5244,14 @@
}
#endif
avp = ATH_VAP(vap);
- if (avp == NULL || avp->av_bcbuf == NULL) {
- DPRINTF(sc, ATH_DEBUG_ANY, "Returning NULL, one of these "
- "is NULL {avp=%p av_bcbuf=%p}\n",
- avp, avp->av_bcbuf);
+ if (avp == NULL) {
+ DPRINTF(sc, ATH_DEBUG_ANY, "%s: avp is NULL\n", __func__);
return NULL;
}
+ if (avp->av_bcbuf == NULL) {
+ DPRINTF(sc, ATH_DEBUG_ANY, "%s: av_bcbuf is NULL\n", __func__);
+ return NULL;
+ }
bf = avp->av_bcbuf;
#ifdef ATH_SUPERG_DYNTURBO
@@ -6334,7 +6336,7 @@
/* NB: last descriptor */
ds = prev->bf_desc;
#endif
- ts = &bf->bf_dsstatus.ds_txstat;
+ ts = &prev->bf_dsstatus.ds_txstat;
status = ath_hal_txprocdesc(
ah, ds, ts
);
@@ -6529,7 +6531,7 @@
DPRINTF(sc, ATH_DEBUG_XMIT_PROC,
"moved %d buffers from XR to NORMAL\n"m count);
}
-#endif
+#endif /* NOT_YET */
return 0;
}
#endif
@@ -10958,7 +10960,7 @@
* being very careful or taking something into account that I can't
* find in the specs.
*
- * XXX: Update based on emperical evidence (potentially save 15us per
+ * XXX: Update based on empirical evidence (potentially save 15us per
* timeout). */
return ath_slottime2timeout(sc, ath_distance2slottime(sc, distance));
}
@@ -11477,7 +11479,7 @@
.proc_handler = ath_sysctl_halparam,
.extra2 = (void *)ATH_INTMIT,
},
- { 0 }
+ { }
};
static void
@@ -11672,21 +11674,21 @@
.maxlen = sizeof(ath_xchanmode),
.proc_handler = proc_dointvec
},
- { 0 }
+ { }
};
static ctl_table ath_ath_table[] = {
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_static_sysctls
- }, { 0 }
+ }, { }
};
static ctl_table ath_root_table[] = {
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table
- }, { 0 }
+ }, { }
};
static struct ctl_table_header *ath_sysctl_header;
@@ -12526,7 +12528,7 @@
atomic_dec(&sc->sc_txbuf_counter);
#ifdef IEEE80211_DEBUG_REFCNT
DPRINTF(sc, ATH_DEBUG_TXBUF,
- "[TXBUF=%03d/%03d] returned txbuf %p.\n",
+ "[TXBUF=%03d/%03d] returned txbuf.\n",
ath_get_buffer_count(sc), ATH_TXBUF);
#endif /* #ifdef IEEE80211_DEBUG_REFCNT */
if (netif_queue_stopped(sc->sc_dev) &&
Modified: madwifi/branches/madwifi-dfs/ath/if_ath_pci.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_ath_pci.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath/if_ath_pci.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -119,7 +119,7 @@
#endif
{ 0x168c, 0x002a, PCI_ANY_ID, PCI_ANY_ID }, /* AR9280 PCI Express */
{ 0x168c, 0x9013, PCI_ANY_ID, PCI_ANY_ID }, /* sonicwall */
- { 0 }
+ { }
};
static u16 ath_devidmap[][2] = {
Modified: madwifi/branches/madwifi-dfs/ath/if_ath_radar.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_ath_radar.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath/if_ath_radar.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -1701,9 +1701,8 @@
ath_rp_clear(sc);
- sc->sc_rp = (struct ath_rp *)kzalloc(
- sizeof(struct ath_rp) *
- ATH_RADAR_PULSE_NR, GFP_KERNEL);
+ sc->sc_rp = kzalloc(sizeof(struct ath_rp) * ATH_RADAR_PULSE_NR,
+ GFP_KERNEL);
if (sc->sc_rp == NULL)
return;
Modified: madwifi/branches/madwifi-dfs/ath/if_athvar.h
===================================================================
--- madwifi/branches/madwifi-dfs/ath/if_athvar.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath/if_athvar.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -125,12 +125,6 @@
#define SET_NETDEV_DEV(ndev, pdev)
#endif
-#ifdef to_net_dev
-#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->dev.parent)
-#else
-#define ATH_GET_NETDEV_DEV(ndev) ((ndev)->class_dev.dev)
-#endif
-
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23)
static inline struct net_device *_alloc_netdev(int sizeof_priv, const char *mask,
void (*setup)(struct net_device *))
@@ -703,7 +697,7 @@
unsigned int sc_useintmit:1; /* Interference mitigation enabled? */
unsigned int sc_txcont:1; /* Is continuous transmit enabled? */
unsigned int sc_dfs_testmode:1; /* IF this is on, AP vaps will stay in
- * 'channel availability check' indefinately,
+ * 'channel availability check' indefinitely,
* reporting radar and interference detections. */
unsigned int sc_dmasize_stomp:1; /* Whether to stomp on DMA size. */
Modified: madwifi/branches/madwifi-dfs/ath_hal/ah.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ah.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ah.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -151,7 +151,7 @@
kbps = rates->info[rateix].rateKbps;
/*
- * index can be invalid duting dynamic Turbo transitions.
+ * index can be invalid during dynamic Turbo transitions.
*/
if(kbps == 0) return 0;
switch (rates->info[rateix].phy) {
Modified: madwifi/branches/madwifi-dfs/ath_hal/ah_os.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ah_os.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ah_os.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -1025,28 +1025,28 @@
.proc_handler = proc_dointvec
},
#endif /* AH_DEBUG_ALQ */
- { 0 }
+ { }
};
static ctl_table ath_hal_table[] = {
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "hal",
.mode = 0555,
.child = ath_hal_sysctls
- }, { 0 }
+ }, { }
};
static ctl_table ath_ath_table[] = {
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_hal_table
- }, { 0 }
+ }, { }
};
static ctl_table ath_root_table[] = {
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table
- }, { 0 }
+ }, { }
};
static struct ctl_table_header *ath_hal_sysctl_header;
Modified: madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ah_regdomain.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -2361,7 +2361,7 @@
return (bitmask[byteOffset] & val) != 0;
}
-/* Add given regclassid into regclassids array upto max of maxregids */
+/* Add given regclassid into regclassids array up to max of maxregids */
static void
ath_add_regclassid(uint8_t *regclassids, u_int maxregids,
u_int *nregids, uint8_t regclassid)
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5211/ar5211_reset.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -940,7 +940,7 @@
}
/*
- * Read the NF and check it against the noise floor threshhold
+ * Read the NF and check it against the noise floor threshold
*
* Returns: TRUE if the NF is good
*/
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -381,9 +381,9 @@
* change pwr_I_0 to signed 5-bits.
*/
int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on. */
+ /* to accommodate -ve power levels later on. */
int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on */
+ /* to accommodate -ve power levels later on */
uint16_t numVpd = 0;
uint16_t Vpd_step;
int16_t tmpVal ;
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -358,9 +358,9 @@
* change pwr_I_0 to signed 5-bits.
*/
int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on. */
+ /* to accommodate -ve power levels later on. */
int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on */
+ /* to accommodate -ve power levels later on */
uint16_t numVpd = 0;
uint16_t Vpd_step;
int16_t tmpVal ;
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -375,9 +375,9 @@
* change pwr_I_0 to signed 5-bits.
*/
int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on. */
+ /* to accommodate -ve power levels later on. */
int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on */
+ /* to accommodate -ve power levels later on */
uint16_t numVpd = 0;
uint16_t Vpd_step;
int16_t tmpVal ;
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -380,9 +380,9 @@
* change pwr_I_0 to signed 5-bits.
*/
static int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on. */
+ /* to accommodate -ve power levels later on. */
static int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on */
+ /* to accommodate -ve power levels later on */
uint16_t numVpd = 0;
uint16_t Vpd_step;
int16_t tmpVal ;
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_attach.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -836,7 +836,7 @@
pCap->halRfSilentSupport = AH_TRUE;
}
- /* NB: this is a guess, noone seems to know the answer */
+ /* NB: this is a guess, no one seems to know the answer */
ahpriv->ah_rxornIsFatal =
(AH_PRIVATE(ah)->ah_macVersion < AR_SREV_VERSION_VENICE);
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_power.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -51,7 +51,7 @@
* which when blindly written back with OS_REG_RMW_FIELD
* enables the MIB interrupt for the sleep performance
* counters. This can result in an interrupt storm when
- * ANI is in operation as noone knows to turn off the MIB
+ * ANI is in operation as no one knows to turn off the MIB
* interrupt cause.
*/
scr = OS_REG_READ(ah, AR_SCR);
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5212_reset.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -1257,7 +1257,7 @@
}
/*
- * Read the NF and check it against the noise floor threshhold
+ * Read the NF and check it against the noise floor threshold
*/
int16_t
ar5212GetNf(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -411,9 +411,9 @@
* change pwr_I_0 to signed 5-bits.
*/
int16_t Pmin_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on. */
+ /* to accommodate -ve power levels later on. */
int16_t Pmax_t2[MAX_NUM_PDGAINS_PER_CHANNEL];
- /* to accomodate -ve power levels later on */
+ /* to accommodate -ve power levels later on */
uint16_t numVpd = 0;
uint16_t Vpd_step;
int16_t tmpVal ;
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_cal.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -621,7 +621,7 @@
}
/*
- * Read the NF and check it against the noise floor threshhold
+ * Read the NF and check it against the noise floor threshold
*/
static int16_t
ar5416GetNf(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_xmit.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -563,7 +563,7 @@
}
/*
- * These fields are not used. Zero these to preserve compatability
+ * These fields are not used. Zero these to preserve compatibility
* with existing drivers.
*/
ts->ts_virtcol = MS(ads->ds_ctl1, AR_VirtRetryCnt);
Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h
===================================================================
--- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416reg.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -192,10 +192,10 @@
#define AR_PCIE_PM_CTRL_ENA 0x00080000
#define AR_AHB_EXACT_WR_EN 0x00000000 /* write exact bytes */
-#define AR_AHB_BUF_WR_EN 0x00000001 /* buffer write upto cacheline*/
+#define AR_AHB_BUF_WR_EN 0x00000001 /* buffer write up to cacheline*/
#define AR_AHB_EXACT_RD_EN 0x00000000 /* read exact bytes */
-#define AR_AHB_CACHELINE_RD_EN 0x00000002 /* read upto end of cacheline */
-#define AR_AHB_PREFETCH_RD_EN 0x00000004 /* prefetch upto page boundary*/
+#define AR_AHB_CACHELINE_RD_EN 0x00000002 /* read up to end of cacheline */
+#define AR_AHB_PREFETCH_RD_EN 0x00000004 /* prefetch up to page boundary*/
#define AR_AHB_PAGE_SIZE_1K 0x00000000 /* set page-size as 1k */
#define AR_AHB_PAGE_SIZE_2K 0x00000008 /* set page-size as 2k */
#define AR_AHB_PAGE_SIZE_4K 0x00000010 /* set page-size as 4k */
@@ -416,7 +416,7 @@
#define AR_PCU_MISS_BCN_IN_SLEEP 0x00004000 /* count bmiss's when sleeping */
#define AR_PCU_BUG_12306_FIX_ENA 0x00020000 /* use rx_clear to count sifs */
#define AR_PCU_FORCE_QUIET_COLL 0x00040000 /* kill xmit for channel change */
-#define AR_PCU_TBTT_PROTECT 0x00200000 /* no xmit upto tbtt+20 uS */
+#define AR_PCU_TBTT_PROTECT 0x00200000 /* no xmit up to tbtt+20 uS */
#define AR_PCU_CLEAR_VMF 0x01000000 /* clear vmf mode (fast cc)*/
#define AR_PCU_CLEAR_BA_VALID 0x04000000 /* clear ba state */
Modified: madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_rate/amrr/amrr.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -516,28 +516,28 @@
.extra2 = &maxint,
.proc_handler = proc_dointvec_minmax
},
- { 0 }
+ { }
};
static ctl_table ath_rate_table[] = {
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rate_amrr",
.mode = 0555,
.child = ath_rate_static_sysctls
- }, { 0 }
+ }, { }
};
static ctl_table ath_ath_table[] = {
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_rate_table
- }, { 0 }
+ }, { }
};
static ctl_table ath_root_table[] = {
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table
- }, { 0 }
+ }, { }
};
static struct ctl_table_header *ath_sysctl_header;
Modified: madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_rate/minstrel/minstrel.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -61,7 +61,7 @@
*
* It is not an aimless search, there is some direction to the search
* pattern. But then, the minstels of old only sung where they thought
- * they would get an income. Similarily, we direct thesearch a little.
+ * they would get an income. Similarly, we direct the search a little.
*
* Enjoy. Derek Smithies. */
Modified: madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c
===================================================================
--- madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/ath_rate/onoe/onoe.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -463,28 +463,28 @@
.maxlen = sizeof(ath_rate_raise_threshold),
.proc_handler = proc_dointvec
},
- { 0 }
+ { }
};
static ctl_table ath_rate_table[] = {
{ ATH_INIT_CTL_NAME(CTL_AUTO)
.procname = "rate_onoe",
.mode = 0555,
.child = ath_rate_static_sysctls
- }, { 0 }
+ }, { }
};
static ctl_table ath_ath_table[] = {
{ ATH_INIT_CTL_NAME(DEV_ATH)
.procname = "ath",
.mode = 0555,
.child = ath_rate_table
- }, { 0 }
+ }, { }
};
static ctl_table ath_root_table[] = {
{ ATH_INIT_CTL_NAME(CTL_DEV)
.procname = "dev",
.mode = 0555,
.child = ath_ath_table
- }, { 0 }
+ }, { }
};
static struct ctl_table_header *ath_sysctl_header;
Modified: madwifi/branches/madwifi-dfs/include/compat.h
===================================================================
--- madwifi/branches/madwifi-dfs/include/compat.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/include/compat.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -78,9 +78,11 @@
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
+#ifndef netdev_for_each_mc_addr
#define netdev_for_each_mc_addr(mclist, dev) \
- for (mclist = dev->mc_list; mclist; mclist = mclist->next)
+ for (mclist = (dev)->mc_list; mclist; mclist = mclist->next)
#endif
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)
#define ath_netdev_hw_addr dev_mc_list
@@ -92,7 +94,7 @@
/*
* BSD/Linux compatibility shims. These are used mainly to
- * minimize differences when importing necesary BSD code.
+ * minimize differences when importing necessary BSD code.
*/
#define NBBY 8 /* number of bits/byte */
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -1847,7 +1847,7 @@
* NB: this is not quite right, since we should have one of:
* 'I': indoor only
* 'O': outdoor only
- * ' ': all enviroments
+ * ' ': all environments
* we currently can only provide 'I' or ' '.
*/
ic->ic_country_ie.country_str[2] = 'I';
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -391,7 +391,7 @@
/* since ieee80211_input() can be called multiple times for
* flooding VAPs when we don't know which VAP needs the packet -
* we don't want to update the wrong state when ni is assigned
- * to the bss node to accomodate this case. */
+ * to the bss node to accommodate this case. */
if (IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr)) {
ni->ni_rssi = rssi;
ni->ni_rtsf = rtsf;
@@ -1037,7 +1037,7 @@
if (more_frag) {
if (skb_is_nonlinear(skb)) {
/*
- * We need a continous buffer to
+ * We need a continuous buffer to
* assemble fragments
*/
ni->ni_rxfrag = skb_copy(skb, GFP_ATOMIC);
@@ -1180,11 +1180,13 @@
skb->protocol = eth_type_trans(skb, dev);
#endif
tni = SKB_NI(skb);
+#if IEEE80211_VLAN_TAG_USED
if ((ni->ni_vlan != 0) && (vap->iv_vlgrp != NULL))
/* Attach VLAN tag. */
ret = vlan_hwaccel_rx(skb,
vap->iv_vlgrp, ni->ni_vlan);
else
+#endif
ret = netif_rx(skb);
if (ret == NET_RX_DROP)
vap->iv_devstats.rx_dropped++;
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -99,7 +99,7 @@
};
static struct attribute_group ieee80211_attr_grp = {
- .name = NULL, /* No seperate (sub-)directory */
+ .name = NULL, /* No separate (sub-)directory */
.attrs = ieee80211_sysfs_attrs
};
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) */
@@ -146,11 +146,7 @@
u_int len;
len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4);
-#ifdef IEEE80211_DEBUG_REFCNT
- skb = ieee80211_dev_alloc_skb_debug(len + align - 1, func, line);
-#else
skb = ieee80211_dev_alloc_skb(len + align - 1);
-#endif
if (skb != NULL) {
u_int off = ((unsigned long) skb->data) % align;
if (off != 0)
@@ -935,7 +931,7 @@
.mode = 0444,
.proc_handler = proc_dostring
},
- { 0 }
+ { }
};
void
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -615,7 +615,8 @@
char *);
void ieee80211_proc_cleanup(struct ieee80211vap *);
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) && \
+ (defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE))
#define IEEE80211_VLAN_TAG_USED 1
#ifndef VLAN_GROUP_ARRAY_PART_LEN
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_node.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -374,7 +374,7 @@
IEEE80211_DPRINTF(vap, IEEE80211_MSG_ASSOC,
"%s: ni:%p allocated for " MAC_FMT "\n",
__func__, ni, MAC_ADDR(vap->iv_myaddr));
- KASSERT(ni != NULL, ("unable to setup inital BSS node"));
+ KASSERT(ni != NULL, ("unable to setup initial BSS node"));
vap->iv_bss = PASS_NODE(ni);
KASSERT((atomic_read(&vap->iv_bss->ni_refcnt) == 2),
@@ -702,7 +702,7 @@
if (ni == NULL) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
"%s: Unable to allocate node for BSS: " MAC_FMT "\n", __func__,
- MAC_ADDR(ni->ni_macaddr));
+ MAC_ADDR(se->se_macaddr));
return 0;
}
}
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_node.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -279,7 +279,7 @@
/* Reference counting only needs to be locked out against the transitions,
* 0->1 and 1->0 (i.e., when we do not own the reference we are getting).
* This only happens when finding the a node reference from the node table,
- * which is locked seperately. Thus, we do not need to lock the follwoing
+ * which is locked separately. Thus, we do not need to lock the following
* functions.
* Increment the reference counter for ieee80211_node *. */
struct ieee80211_node *ieee80211_ref_node(struct ieee80211_node *ni);
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -273,20 +273,20 @@
{
if (NULL == skb) {
skb_print_message(0 /* show_counter */,
- skb, func2, line2,
+ skb, func, line,
"ERROR: NULL skb received. Skipping.");
return NULL;
}
if (M_FLAG_GET(skb, M_SKB_TRACKED)) {
skb_print_message(0 /* show_counter */,
- skb, func2, line2,
+ skb, func, line,
"ERROR: Already tracked skb received. Skipping.");
dump_stack();
return skb;
}
if (skb_shared(skb)) {
skb_print_message(0 /* show_counter */,
- skb, func2, line2,
+ skb, func, line,
"ERROR: Shared skb received. References leaked??");
dump_stack();
}
@@ -294,7 +294,7 @@
atomic_inc(&skb_refs_counter);
M_FLAG_SET(skb, M_SKB_TRACKED);
print_skb_trackchange_message(skb, users_adjustment,
- func2, line2,
+ func, line,
" is now ** TRACKED **");
#ifdef IEEE80211_DEBUG_REFCNT_SKBDEST
/* Install our debug destructor, chaining to the original... */
@@ -380,7 +380,7 @@
if (skb_shared(skb)) {
atomic_dec(&skb_refs_counter);
- print_skb_refchange_message(skb, -1, func2, line2);
+ print_skb_refchange_message(skb, -1, func, line);
}
else {
if (SKB_NI(skb) != NULL) {
@@ -570,6 +570,7 @@
#ifdef IEEE80211_DEBUG_REFCNT
+#if IEEE80211_VLAN_TAG_USED
int vlan_hwaccel_rx_debug(struct sk_buff *skb,
struct vlan_group *grp, unsigned short vlan_tag,
const char *func, int line) {
@@ -577,6 +578,7 @@
untrack_skb(skb, 0, __func__, __LINE__),
grp, vlan_tag);
}
+#endif
int netif_rx_debug(struct sk_buff *skb, const char *func, int line) {
return netif_rx(untrack_skb(skb, 0, __func__, __LINE__));
@@ -672,7 +674,7 @@
const char *func, int line)
{
/* NOT so fast... */
- unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line, __func__, __LINE__);
+ unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line);
}
struct sk_buff *skb_unshare_debug(struct sk_buff *skb, gfp_t pri,
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_var.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -76,7 +76,7 @@
* This is halfway between the 10@100ms default from prior hardcoded setting for
* software beacon miss timers, and the 7@100ms default from prior hardcoded
* timer value for hardware beacon miss timer.
- * Based upon emperical evidence and practices of commercial vendors, I believe
+ * Based upon empirical evidence and practices of commercial vendors, I believe
* this should really be 2500ms by default. */
#define IEEE80211_BMISSTHRESH_DEFAULT_MS 850
Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_wireless.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -983,7 +983,7 @@
}
/* Atheros' RSSI value is SNR: 0 -> 60 for old chipsets. Range
- * for newer chipsets is unknown. This value is arbitarily chosen
+ * for newer chipsets is unknown. This value is arbitrarily chosen
* to give an indication that full rate will be available and to be
* a practicable maximum. */
range->max_qual.qual = 70;
@@ -2186,7 +2186,7 @@
strcat(name, "-xr");
/*
* Create a new XR vap. If the normal VAP is already up,
- * bring up the XR vap aswell.
+ * bring up the XR vap as well.
*/
vap->iv_ath_cap &= ~IEEE80211_ATHC_TURBOP; /* turn off turbo */
ieee80211_scan_flush(ic); /* NB: could optimize */
Modified: madwifi/branches/madwifi-dfs/net80211/if_media.c
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/if_media.c 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/net80211/if_media.c 2011-10-25 21:38:00 UTC (rev 4174)
@@ -292,8 +292,8 @@
return (-EINVAL);
if (ifmr->ifm_count != 0) {
- kptr = (int *)kmalloc(ifmr->ifm_count * sizeof(int),
- GFP_KERNEL);
+ kptr = kmalloc(ifmr->ifm_count * sizeof(int),
+ GFP_KERNEL);
if (kptr == NULL)
return (-ENOMEM);
Modified: madwifi/branches/madwifi-dfs/tools/wireless_copy.h
===================================================================
--- madwifi/branches/madwifi-dfs/tools/wireless_copy.h 2011-10-07 21:43:03 UTC (rev 4173)
+++ madwifi/branches/madwifi-dfs/tools/wireless_copy.h 2011-10-25 21:38:00 UTC (rev 4174)
@@ -1065,7 +1065,7 @@
*/
struct iw_event
{
- __u16 len; /* Real lenght of this stuff */
+ __u16 len; /* Real length of this stuff */
__u16 cmd; /* Wireless IOCTL */
union iwreq_data u; /* IOCTL fixed payload */
};
|