Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 259776
b: refs/heads/master
c: 5e92aa8
h: refs/heads/master
v: v3
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent f58ab57 commit 91128a0
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 96 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 05dc0f4346428077611410745c7726c2a0bdb282
refs/heads/master: 5e92aa8c6584b9a5d861c971c3dbfc18f5c57b5a
40 changes: 20 additions & 20 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,57 +775,57 @@ extern atomic_t dhd_mmc_suspend;
*/

/* Watchdog timer interval */
extern uint dhd_watchdog_ms;
extern uint brcmf_watchdog_ms;

#if defined(DHD_DEBUG)
/* Console output poll interval */
extern uint dhd_console_ms;
extern uint brcmf_console_ms;
#endif /* defined(DHD_DEBUG) */

/* Use interrupts */
extern uint dhd_intr;
extern uint brcmf_intr;

/* Use polling */
extern uint dhd_poll;
extern uint brcmf_poll;

/* ARP offload agent mode */
extern uint dhd_arp_mode;
extern uint brcmf_arp_mode;

/* ARP offload enable */
extern uint dhd_arp_enable;
extern uint brcmf_arp_enable;

/* Pkt filte enable control */
extern uint dhd_pkt_filter_enable;
extern uint brcmf_pkt_filter_enable;

/* Pkt filter init setup */
extern uint dhd_pkt_filter_init;
extern uint brcmf_pkt_filter_init;

/* Pkt filter mode control */
extern uint dhd_master_mode;
extern uint brcmf_master_mode;

/* Roaming mode control */
extern uint dhd_roam;
extern uint brcmf_roam;

/* Roaming mode control */
extern uint dhd_radio_up;
extern uint brcmf_radio_up;

/* Initial idletime ticks (may be -1 for immediate idle, 0 for no idle) */
extern int dhd_idletime;
#define DHD_IDLETIME_TICKS 1
extern int brcmf_idletime;
#define BRCMF_IDLETIME_TICKS 1

/* SDIO Drive Strength */
extern uint dhd_sdiod_drive_strength;
extern uint brcmf_sdiod_drive_strength;

/* Override to force tx queueing all the time */
extern uint dhd_force_tx_queueing;
extern uint brcmf_force_tx_queueing;

#ifdef SDTEST
/* Echo packet generator (SDIO), pkts/s */
extern uint dhd_pktgen;
extern uint brcmf_pktgen;

/* Echo packet len (0 => sawtooth, max 1800) */
extern uint dhd_pktgen_len;
#define MAX_PKTGEN_LEN 1800
extern uint brcmf_pktgen_len;
#define BRCMF_MAX_PKTGEN_LEN 1800
#endif

extern char brcmf_fw_path[MOD_PARAM_PATHLEN];
Expand Down Expand Up @@ -1032,7 +1032,7 @@ typedef struct dhd_ioctl {

#ifdef SDTEST
/* For pktgen iovar */
typedef struct dhd_pktgen {
typedef struct brcmf_pktgen {
uint version; /* To allow structure change tracking */
uint freq; /* Max ticks between tx/rx attempts */
uint count; /* Test packets to send/rcv each attempt */
Expand All @@ -1045,7 +1045,7 @@ typedef struct dhd_pktgen {
uint numfail; /* Count of test send failures */
uint mode; /* Test mode (type of test packets) */
uint stop; /* Stop after this many tx failures */
} dhd_pktgen_t;
} brcmf_pktgen_t;

/* Version in case structure changes */
#define DHD_PKTGEN_VERSION 2
Expand Down
23 changes: 12 additions & 11 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ brcmf_c_doiovar(dhd_pub_t *dhd_pub, const struct brcmu_iovar *vi, u32 actionid,
break;

case IOV_GVAL(IOV_WDTICK):
int_val = (s32) dhd_watchdog_ms;
int_val = (s32) brcmf_watchdog_ms;
memcpy(arg, &int_val, val_size);
break;

Expand All @@ -271,12 +271,12 @@ brcmf_c_doiovar(dhd_pub_t *dhd_pub, const struct brcmu_iovar *vi, u32 actionid,

#ifdef DHD_DEBUG
case IOV_GVAL(IOV_DCONSOLE_POLL):
int_val = (s32) dhd_console_ms;
int_val = (s32) brcmf_console_ms;
memcpy(arg, &int_val, val_size);
break;

case IOV_SVAL(IOV_DCONSOLE_POLL):
dhd_console_ms = (uint) int_val;
brcmf_console_ms = (uint) int_val;
break;

case IOV_SVAL(IOV_CONS):
Expand Down Expand Up @@ -1271,11 +1271,12 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd)

/* Enable/Disable build-in roaming to allowed ext supplicant to take
of romaing */
brcmu_mkiovar("roam_off", (char *)&dhd_roam, 4, iovbuf, sizeof(iovbuf));
brcmu_mkiovar("roam_off", (char *)&brcmf_roam, 4,
iovbuf, sizeof(iovbuf));
dhdcdc_set_ioctl(dhd, 0, BRCMF_C_SET_VAR, iovbuf, sizeof(iovbuf));

/* Force STA UP */
if (dhd_radio_up)
if (brcmf_radio_up)
dhdcdc_set_ioctl(dhd, 0, BRCMF_C_UP, (char *)&up, sizeof(up));

/* Setup event_msgs */
Expand All @@ -1290,23 +1291,23 @@ int brcmf_c_preinit_ioctls(dhd_pub_t *dhd)

#ifdef ARP_OFFLOAD_SUPPORT
/* Set and enable ARP offload feature */
if (dhd_arp_enable)
brcmf_c_arp_offload_set(dhd, dhd_arp_mode);
brcmf_c_arp_offload_enable(dhd, dhd_arp_enable);
if (brcmf_arp_enable)
brcmf_c_arp_offload_set(dhd, brcmf_arp_mode);
brcmf_c_arp_offload_enable(dhd, brcmf_arp_enable);
#endif /* ARP_OFFLOAD_SUPPORT */

#ifdef PKT_FILTER_SUPPORT
{
int i;
/* Set up pkt filter */
if (dhd_pkt_filter_enable) {
if (brcmf_pkt_filter_enable) {
for (i = 0; i < dhd->pktfilter_count; i++) {
brcmf_c_pktfilter_offload_set(dhd,
dhd->pktfilter[i]);
brcmf_c_pktfilter_offload_enable(dhd,
dhd->pktfilter[i],
dhd_pkt_filter_init,
dhd_master_mode);
brcmf_pkt_filter_init,
brcmf_master_mode);
}
}
}
Expand Down
78 changes: 39 additions & 39 deletions trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,35 +259,35 @@ uint dhd_sysioc = true;
module_param(dhd_sysioc, uint, 0);

/* Watchdog interval */
uint dhd_watchdog_ms = 10;
module_param(dhd_watchdog_ms, uint, 0);
uint brcmf_watchdog_ms = 10;
module_param(brcmf_watchdog_ms, uint, 0);

#ifdef DHD_DEBUG
/* Console poll interval */
uint dhd_console_ms;
module_param(dhd_console_ms, uint, 0);
uint brcmf_console_ms;
module_param(brcmf_console_ms, uint, 0);
#endif /* DHD_DEBUG */

/* ARP offload agent mode : Enable ARP Host Auto-Reply
and ARP Peer Auto-Reply */
uint dhd_arp_mode = 0xb;
module_param(dhd_arp_mode, uint, 0);
uint brcmf_arp_mode = 0xb;
module_param(brcmf_arp_mode, uint, 0);

/* ARP offload enable */
uint dhd_arp_enable = true;
module_param(dhd_arp_enable, uint, 0);
uint brcmf_arp_enable = true;
module_param(brcmf_arp_enable, uint, 0);

/* Global Pkt filter enable control */
uint dhd_pkt_filter_enable = true;
module_param(dhd_pkt_filter_enable, uint, 0);
uint brcmf_pkt_filter_enable = true;
module_param(brcmf_pkt_filter_enable, uint, 0);

/* Pkt filter init setup */
uint dhd_pkt_filter_init;
module_param(dhd_pkt_filter_init, uint, 0);
uint brcmf_pkt_filter_init;
module_param(brcmf_pkt_filter_init, uint, 0);

/* Pkt filter mode control */
uint dhd_master_mode = true;
module_param(dhd_master_mode, uint, 1);
uint brcmf_master_mode = true;
module_param(brcmf_master_mode, uint, 1);

/* Watchdog thread priority, -1 to use kernel timer */
int dhd_watchdog_prio = 97;
Expand All @@ -303,13 +303,13 @@ module_param(dhd_dongle_memsize, int, 0);

/* Contorl fw roaming */
#ifdef CUSTOMER_HW2
uint dhd_roam;
uint brcmf_roam;
#else
uint dhd_roam = 1;
uint brcmf_roam = 1;
#endif

/* Control radio state */
uint dhd_radio_up = 1;
uint brcmf_radio_up = 1;

/* Network inteface name */
char iface_name[IFNAMSIZ] = "wlan";
Expand All @@ -321,20 +321,20 @@ module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
int dhd_ioctl_timeout_msec = IOCTL_RESP_TIMEOUT;

/* Idle timeout for backplane clock */
int dhd_idletime = DHD_IDLETIME_TICKS;
module_param(dhd_idletime, int, 0);
int brcmf_idletime = BRCMF_IDLETIME_TICKS;
module_param(brcmf_idletime, int, 0);

/* Use polling */
uint dhd_poll;
module_param(dhd_poll, uint, 0);
uint brcmf_poll;
module_param(brcmf_poll, uint, 0);

/* Use interrupts */
uint dhd_intr = true;
module_param(dhd_intr, uint, 0);
uint brcmf_intr = true;
module_param(brcmf_intr, uint, 0);

/* SDIO Drive Strength (in milliamps) */
uint dhd_sdiod_drive_strength = 6;
module_param(dhd_sdiod_drive_strength, uint, 0);
uint brcmf_sdiod_drive_strength = 6;
module_param(brcmf_sdiod_drive_strength, uint, 0);

/* Tx/Rx bounds */
extern uint dhd_txbound;
Expand All @@ -348,12 +348,12 @@ module_param(dhd_deferred_tx, uint, 0);

#ifdef SDTEST
/* Echo packet generator (pkts/s) */
uint dhd_pktgen;
module_param(dhd_pktgen, uint, 0);
uint brcmf_pktgen;
module_param(brcmf_pktgen, uint, 0);

/* Echo packet len (0 => sawtooth, max 2040) */
uint dhd_pktgen_len;
module_param(dhd_pktgen_len, uint, 0);
uint brcmf_pktgen_len;
module_param(brcmf_pktgen_len, uint, 0);
#endif

/* Version string to report */
Expand Down Expand Up @@ -384,13 +384,13 @@ static void dhd_set_packet_filter(int value, dhd_pub_t *dhd)
DHD_TRACE(("%s: %d\n", __func__, value));
/* 1 - Enable packet filter, only allow unicast packet to send up */
/* 0 - Disable packet filter */
if (dhd_pkt_filter_enable) {
if (brcmf_pkt_filter_enable) {
int i;

for (i = 0; i < dhd->pktfilter_count; i++) {
brcmf_c_pktfilter_offload_set(dhd, dhd->pktfilter[i]);
brcmf_c_pktfilter_offload_enable(dhd, dhd->pktfilter[i],
value, dhd_master_mode);
value, brcmf_master_mode);
}
}
#endif
Expand Down Expand Up @@ -1276,7 +1276,7 @@ static void dhd_watchdog(unsigned long data)
/* Reschedule the watchdog */
if (dhd->wd_timer_valid) {
mod_timer(&dhd->timer,
jiffies + dhd_watchdog_ms * HZ / 1000);
jiffies + brcmf_watchdog_ms * HZ / 1000);
}
return;
}
Expand All @@ -1289,7 +1289,7 @@ static void dhd_watchdog(unsigned long data)

/* Reschedule the watchdog */
if (dhd->wd_timer_valid)
mod_timer(&dhd->timer, jiffies + dhd_watchdog_ms * HZ / 1000);
mod_timer(&dhd->timer, jiffies + brcmf_watchdog_ms * HZ / 1000);
}

static int dhd_dpc_thread(void *data)
Expand Down Expand Up @@ -1992,7 +1992,7 @@ int dhd_bus_start(dhd_pub_t *dhdp)

/* Start the watchdog timer */
dhd->pub.tickcnt = 0;
dhd_os_wd_timer(&dhd->pub, dhd_watchdog_ms);
dhd_os_wd_timer(&dhd->pub, brcmf_watchdog_ms);

/* Bring up the bus */
ret = brcmf_sdbrcm_bus_init(&dhd->pub, true);
Expand Down Expand Up @@ -2403,9 +2403,9 @@ void dhd_os_wd_timer(void *bus, uint wdtick)
}

if (wdtick) {
dhd_watchdog_ms = (uint) wdtick;
brcmf_watchdog_ms = (uint) wdtick;

if (save_dhd_watchdog_ms != dhd_watchdog_ms) {
if (save_dhd_watchdog_ms != brcmf_watchdog_ms) {

if (dhd->wd_timer_valid == true)
/* Stop timer and restart at new value */
Expand All @@ -2415,13 +2415,13 @@ void dhd_os_wd_timer(void *bus, uint wdtick)
dynamically changed or in the first instance
*/
dhd->timer.expires =
jiffies + dhd_watchdog_ms * HZ / 1000;
jiffies + brcmf_watchdog_ms * HZ / 1000;
add_timer(&dhd->timer);

} else {
/* Re arm the timer, at last watchdog period */
mod_timer(&dhd->timer,
jiffies + dhd_watchdog_ms * HZ / 1000);
jiffies + brcmf_watchdog_ms * HZ / 1000);
}

dhd->wd_timer_valid = true;
Expand Down Expand Up @@ -2558,7 +2558,7 @@ int dhd_dev_reset(struct net_device *dev, u8 flag)

/* Turning on watchdog back */
if (!flag)
dhd_os_wd_timer(&dhd->pub, dhd_watchdog_ms);
dhd_os_wd_timer(&dhd->pub, brcmf_watchdog_ms);
DHD_ERROR(("%s: WLAN OFF DONE\n", __func__));

return 1;
Expand Down
Loading

0 comments on commit 91128a0

Please sign in to comment.