summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-11-22 08:23:53 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-11-22 08:23:53 +0000
commit43695888da2e4634b958ecf96be84c12a7e4edc6 (patch)
tree52a85335d2442bb70454ef3657bdb4f54cf96f6d /sys/dev/pci
parent906ea38b61cd9d0d6f0ea3d3885a41a80f9167f4 (diff)
- Slight wording tweak.. leave -> let.
- Sync wpi(4)'s set_key comment with the comment from iwn(4). ok damien@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_iwn.c4
-rw-r--r--sys/dev/pci/if_wpi.c11
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 1cb0b2d0929..4347d4c19b9 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwn.c,v 1.36 2008/11/21 17:17:05 damien Exp $ */
+/* $OpenBSD: if_iwn.c,v 1.37 2008/11/22 08:23:52 brad Exp $ */
/*-
* Copyright (c) 2007, 2008
@@ -3953,7 +3953,7 @@ iwn_run(struct iwn_softc *sc)
/*
* We support CCMP hardware encryption/decryption of unicast frames only.
- * HW support for TKIP really sucks. We should leave TKIP die anyway.
+ * HW support for TKIP really sucks. We should let TKIP die anyway.
*/
int
iwn_set_key(struct ieee80211com *ic, struct ieee80211_node *ni,
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index f678b662359..191a9eb7ac7 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wpi.c,v 1.72 2008/11/16 09:52:31 damien Exp $ */
+/* $OpenBSD: if_wpi.c,v 1.73 2008/11/22 08:23:52 brad Exp $ */
/*-
* Copyright (c) 2006-2008
@@ -2728,6 +2728,10 @@ wpi_run(struct wpi_softc *sc)
return 0;
}
+/*
+ * We support CCMP hardware encryption/decryption of unicast frames only.
+ * HW support for TKIP really sucks. We should let TKIP die anyway.
+ */
int
wpi_set_key(struct ieee80211com *ic, struct ieee80211_node *ni,
struct ieee80211_key *k)
@@ -2737,11 +2741,6 @@ wpi_set_key(struct ieee80211com *ic, struct ieee80211_node *ni,
struct wpi_node_info node;
uint16_t kflags;
- /*
- * We support CCMP hardware encryption/decryption of unicast frames
- * only. Hardware support for TKIP really sucks and it is not worth
- * implementing. We should leave TKIP die anyway.
- */
if ((k->k_flags & IEEE80211_KEY_GROUP) ||
k->k_cipher != IEEE80211_CIPHER_CCMP)
return ieee80211_set_key(ic, ni, k);