summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2008-07-30 07:43:02 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2008-07-30 07:43:02 +0000
commit83b0b86d61198544b1aca5b2d6c3b61514325eb0 (patch)
tree6f7ff56d12d80578a5f90fe82ada23036c95eb01 /sys/dev
parent2c279d86a8e846c71f5302965d5205367531cccb (diff)
spacing
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ar5212.c10
-rw-r--r--sys/dev/ic/ar5xxx.c6
-rw-r--r--sys/dev/ic/ath.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c
index 82f928ad1ce..d457dad13b2 100644
--- a/sys/dev/ic/ar5212.c
+++ b/sys/dev/ic/ar5212.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5212.c,v 1.44 2008/07/30 07:15:39 reyk Exp $ */
+/* $OpenBSD: ar5212.c,v 1.45 2008/07/30 07:43:01 reyk Exp $ */
/*
* Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -2016,15 +2016,15 @@ ar5k_ar5212_set_associd(struct ath_hal *hal, const u_int8_t *bssid,
HAL_BOOL
ar5k_ar5212_set_bssid_mask(struct ath_hal *hal, const u_int8_t* mask)
{
- u_int32_t low_id, high_id;
+ u_int32_t low_id, high_id;
low_id = AR5K_LOW_ID(mask);
high_id = 0x0000ffff & AR5K_HIGH_ID(mask);
- AR5K_REG_WRITE(AR5K_AR5212_BSS_IDM0, low_id);
- AR5K_REG_WRITE(AR5K_AR5212_BSS_IDM1, high_id);
+ AR5K_REG_WRITE(AR5K_AR5212_BSS_IDM0, low_id);
+ AR5K_REG_WRITE(AR5K_AR5212_BSS_IDM1, high_id);
- return (AH_TRUE);
+ return (AH_TRUE);
}
HAL_BOOL
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c
index de05ccf0d9b..edaac74af4c 100644
--- a/sys/dev/ic/ar5xxx.c
+++ b/sys/dev/ic/ar5xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5xxx.c,v 1.51 2008/07/30 07:15:39 reyk Exp $ */
+/* $OpenBSD: ar5xxx.c,v 1.52 2008/07/30 07:43:01 reyk Exp $ */
/*
* Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -266,9 +266,9 @@ ath_hal_attach(u_int16_t device, void *arg, bus_space_tag_t st,
/* Get rate tables */
if (hal->ah_capabilities.cap_mode & HAL_MODE_11A)
ar5k_rt_copy(&hal->ah_rt_11a, &ar5k_rt_11a);
- if (hal->ah_capabilities.cap_mode & HAL_MODE_11B) {
+ if (hal->ah_capabilities.cap_mode & HAL_MODE_11B)
ar5k_rt_copy(&hal->ah_rt_11b, &ar5k_rt_11b);
- } if (hal->ah_capabilities.cap_mode & HAL_MODE_11G)
+ if (hal->ah_capabilities.cap_mode & HAL_MODE_11G)
ar5k_rt_copy(&hal->ah_rt_11g, &ar5k_rt_11g);
if (hal->ah_capabilities.cap_mode & HAL_MODE_TURBO)
ar5k_rt_copy(&hal->ah_rt_turbo, &ar5k_rt_turbo);
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 07a8c7b0c4a..6c340a24d4f 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ath.c,v 1.71 2008/07/29 00:18:25 reyk Exp $ */
+/* $OpenBSD: ath.c,v 1.72 2008/07/30 07:43:01 reyk Exp $ */
/* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */
/*-
@@ -1726,7 +1726,7 @@ struct ieee80211_node *
ath_node_alloc(struct ieee80211com *ic)
{
struct ath_node *an;
-
+
an = malloc(sizeof(*an), M_DEVBUF, M_NOWAIT | M_ZERO);
if (an) {
int i;