aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ieee80211/ieee80211_crypt.c2
-rw-r--r--net/ieee80211/ieee80211_crypt_ccmp.c4
-rw-r--r--net/ieee80211/ieee80211_crypt_tkip.c6
-rw-r--r--net/ieee80211/ieee80211_crypt_wep.c2
-rw-r--r--net/ieee80211/ieee80211_module.c5
-rw-r--r--net/ieee80211/ieee80211_rx.c4
-rw-r--r--net/ieee80211/ieee80211_wx.c4
7 files changed, 14 insertions, 13 deletions
diff --git a/net/ieee80211/ieee80211_crypt.c b/net/ieee80211/ieee80211_crypt.c
index 5ed0a98b2d76..df5592c9339f 100644
--- a/net/ieee80211/ieee80211_crypt.c
+++ b/net/ieee80211/ieee80211_crypt.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Host AP crypto routines 2 * Host AP crypto routines
3 * 3 *
4 * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> 4 * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
5 * Portions Copyright (C) 2004, Intel Corporation <jketreno@linux.intel.com> 5 * Portions Copyright (C) 2004, Intel Corporation <jketreno@linux.intel.com>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 35aa3426c3fa..b016b4104de6 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Host AP crypt: host-based CCMP encryption implementation for Host AP driver 2 * Host AP crypt: host-based CCMP encryption implementation for Host AP driver
3 * 3 *
4 * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi> 4 * Copyright (c) 2003-2004, Jouni Malinen <j@w1.fi>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
@@ -338,7 +338,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
338 338
339 if (ccmp_replay_check(pn, key->rx_pn)) { 339 if (ccmp_replay_check(pn, key->rx_pn)) {
340 if (net_ratelimit()) { 340 if (net_ratelimit()) {
341 printk(KERN_DEBUG "CCMP: replay detected: STA=" MAC_FMT 341 IEEE80211_DEBUG_DROP("CCMP: replay detected: STA=" MAC_FMT
342 " previous PN %02x%02x%02x%02x%02x%02x " 342 " previous PN %02x%02x%02x%02x%02x%02x "
343 "received PN %02x%02x%02x%02x%02x%02x\n", 343 "received PN %02x%02x%02x%02x%02x%02x\n",
344 MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn), 344 MAC_ARG(hdr->addr2), MAC_ARG(key->rx_pn),
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index fc1f99a59732..5a48d8e0aec1 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Host AP crypt: host-based TKIP encryption implementation for Host AP driver 2 * Host AP crypt: host-based TKIP encryption implementation for Host AP driver
3 * 3 *
4 * Copyright (c) 2003-2004, Jouni Malinen <jkmaline@cc.hut.fi> 4 * Copyright (c) 2003-2004, Jouni Malinen <j@w1.fi>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
@@ -465,7 +465,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
465 465
466 if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) { 466 if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {
467 if (net_ratelimit()) { 467 if (net_ratelimit()) {
468 printk(KERN_DEBUG "TKIP: replay detected: STA=" MAC_FMT 468 IEEE80211_DEBUG_DROP("TKIP: replay detected: STA=" MAC_FMT
469 " previous TSC %08x%04x received TSC " 469 " previous TSC %08x%04x received TSC "
470 "%08x%04x\n", MAC_ARG(hdr->addr2), 470 "%08x%04x\n", MAC_ARG(hdr->addr2),
471 tkey->rx_iv32, tkey->rx_iv16, iv32, iv16); 471 tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);
@@ -507,7 +507,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
507 tkey->rx_phase1_done = 0; 507 tkey->rx_phase1_done = 0;
508 } 508 }
509 if (net_ratelimit()) { 509 if (net_ratelimit()) {
510 printk(KERN_DEBUG "TKIP: ICV error detected: STA=" 510 IEEE80211_DEBUG_DROP("TKIP: ICV error detected: STA="
511 MAC_FMT "\n", MAC_ARG(hdr->addr2)); 511 MAC_FMT "\n", MAC_ARG(hdr->addr2));
512 } 512 }
513 tkey->dot11RSNAStatsTKIPICVErrors++; 513 tkey->dot11RSNAStatsTKIPICVErrors++;
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index 4eb35079e434..8d182459344e 100644
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Host AP crypt: host-based WEP encryption implementation for Host AP driver 2 * Host AP crypt: host-based WEP encryption implementation for Host AP driver
3 * 3 *
4 * Copyright (c) 2002-2004, Jouni Malinen <jkmaline@cc.hut.fi> 4 * Copyright (c) 2002-2004, Jouni Malinen <j@w1.fi>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c
index b1c6d1f717d9..7ec6610841ba 100644
--- a/net/ieee80211/ieee80211_module.c
+++ b/net/ieee80211/ieee80211_module.c
@@ -5,8 +5,8 @@
5 Portions of this file are based on the WEP enablement code provided by the 5 Portions of this file are based on the WEP enablement code provided by the
6 Host AP project hostap-drivers v0.1.3 6 Host AP project hostap-drivers v0.1.3
7 Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen 7 Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
8 <jkmaline@cc.hut.fi> 8 <j@w1.fi>
9 Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> 9 Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
10 10
11 This program is free software; you can redistribute it and/or modify it 11 This program is free software; you can redistribute it and/or modify it
12 under the terms of version 2 of the GNU General Public License as 12 under the terms of version 2 of the GNU General Public License as
@@ -229,6 +229,7 @@ void free_ieee80211(struct net_device *dev)
229 229
230static int debug = 0; 230static int debug = 0;
231u32 ieee80211_debug_level = 0; 231u32 ieee80211_debug_level = 0;
232EXPORT_SYMBOL_GPL(ieee80211_debug_level);
232static struct proc_dir_entry *ieee80211_proc = NULL; 233static struct proc_dir_entry *ieee80211_proc = NULL;
233 234
234static int show_debug_level(char *page, char **start, off_t offset, 235static int show_debug_level(char *page, char **start, off_t offset,
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index 6ae036b1920f..f2de2e48b021 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -3,8 +3,8 @@
3 * for Intersil Prism2/2.5/3 - hostap.o module, common routines 3 * for Intersil Prism2/2.5/3 - hostap.o module, common routines
4 * 4 *
5 * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen 5 * Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
6 * <jkmaline@cc.hut.fi> 6 * <j@w1.fi>
7 * Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> 7 * Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
8 * Copyright (c) 2004-2005, Intel Corporation 8 * Copyright (c) 2004-2005, Intel Corporation
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c
index 40d7a55fe03e..cee5e13bc427 100644
--- a/net/ieee80211/ieee80211_wx.c
+++ b/net/ieee80211/ieee80211_wx.c
@@ -5,8 +5,8 @@
5 Portions of this file are based on the WEP enablement code provided by the 5 Portions of this file are based on the WEP enablement code provided by the
6 Host AP project hostap-drivers v0.1.3 6 Host AP project hostap-drivers v0.1.3
7 Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen 7 Copyright (c) 2001-2002, SSH Communications Security Corp and Jouni Malinen
8 <jkmaline@cc.hut.fi> 8 <j@w1.fi>
9 Copyright (c) 2002-2003, Jouni Malinen <jkmaline@cc.hut.fi> 9 Copyright (c) 2002-2003, Jouni Malinen <j@w1.fi>
10 10
11 This program is free software; you can redistribute it and/or modify it 11 This program is free software; you can redistribute it and/or modify it
12 under the terms of version 2 of the GNU General Public License as 12 under the terms of version 2 of the GNU General Public License as
generated by cgit v1.2.2 (git 2.25.0) at 2025-11-01 17:06:05 -0400