From: Jan Kiszka <jan.kiszka@web.de>
To: Jiri Benc <jbenc@suse.cz>
Cc: netdev@vger.kernel.org, Ivo Van Doorn <ivdoorn@gmail.com>
Subject: [PATCH] d80211: don't symlink empty default keys
Date: Tue, 09 Jan 2007 23:33:34 +0100 [thread overview]
Message-ID: <45A4183E.4010401@web.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1630 bytes --]
This gets rid of annoying
wlan0: cannot create symlink to default key
in my syslog with latest rt2x00. The patch takes care that in case of
(key/old_key == NULL && set_tx_key) the existing default key symlink is
removed correctly. Moreover, it tests for key!=NULL before trying to register
a new default link.
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
---
ieee80211/ieee80211_ioctl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: rt2x00/ieee80211/ieee80211_ioctl.c
===================================================================
--- rt2x00.orig/ieee80211/ieee80211_ioctl.c
+++ rt2x00/ieee80211/ieee80211_ioctl.c
@@ -629,7 +629,7 @@ static int ieee80211_set_encryption(stru
}
kfree(keyconf);
- if (key && sdata->default_key == key) {
+ if (set_tx_key || (key && sdata->default_key == key)) {
ieee80211_key_sysfs_remove_default(sdata);
sdata->default_key = NULL;
}
@@ -673,7 +673,7 @@ static int ieee80211_set_encryption(stru
}
}
- if (old_key && sdata->default_key == old_key) {
+ if (set_tx_key || (old_key && sdata->default_key == old_key)) {
ieee80211_key_sysfs_remove_default(sdata);
sdata->default_key = NULL;
}
@@ -700,7 +700,7 @@ static int ieee80211_set_encryption(stru
if (set_tx_key || (!sta && !sdata->default_key && key)) {
sdata->default_key = key;
- if (ieee80211_key_sysfs_add_default(sdata))
+ if (key && ieee80211_key_sysfs_add_default(sdata))
printk(KERN_WARNING "%s: cannot create symlink to "
"default key\n", dev->name);
if (local->ops->set_key_idx &&
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]
next reply other threads:[~2007-01-09 22:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-09 22:33 Jan Kiszka [this message]
2007-01-09 22:43 ` [PATCH] d80211: don't symlink empty default keys Jan Kiszka
2007-01-10 19:40 ` Jiri Benc
2007-01-10 20:05 ` Jan Kiszka
2007-01-10 20:11 ` Jiri Benc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45A4183E.4010401@web.de \
--to=jan.kiszka@web.de \
--cc=ivdoorn@gmail.com \
--cc=jbenc@suse.cz \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).