Jiri Benc wrote: > On Tue, 09 Jan 2007 23:33:34 +0100, Jan Kiszka wrote: >> 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 <[EMAIL PROTECTED]> >> >> --- >> 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); > > This is not correct when set_tx_key is set and sdata->default_key is > NULL.
Hmm, is this required? Will sysfs_remove_link panic on non-existent nodes? If yes or if it's considered better style, are you OK with catching NULL in ieee80211_key_sysfs_remove_default and refactoring the existing tests along this way? Jan
signature.asc
Description: OpenPGP digital signature