redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mac80211: make ieee80211_wep_init() return void 

This function always returns 0, so there's no point in returning int.
Make it void and remove the impossible error-path when calling it.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/20200131111300.891737-11-luca@coelho.fi
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
alistair/sensors
Luca Coelho 2020-01-31 13:12:47 +02:00 committed by Johannes Berg
parent 07b83d2ecd
commit 4a65cc2437
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/main.c
View File

@ -1185,10 +1185,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
if (!local->hw.weight_multiplier)
local->hw.weight_multiplier = 1;
result = ieee80211_wep_init(local);
if (result < 0)
wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n",
result);
ieee80211_wep_init(local);
local->hw.conf.flags = IEEE80211_CONF_IDLE;

4
net/mac80211/wep.c
View File

@ -22,12 +22,10 @@
#include "wep.h"
int ieee80211_wep_init(struct ieee80211_local *local)
void ieee80211_wep_init(struct ieee80211_local *local)
{
/* start WEP IV from a random value */
get_random_bytes(&local->wep_iv, IEEE80211_WEP_IV_LEN);
return 0;
}
static inline bool ieee80211_wep_weak_iv(u32 iv, int keylen)

2
net/mac80211/wep.h
View File

@ -13,7 +13,7 @@
#include "ieee80211_i.h"
#include "key.h"
int ieee80211_wep_init(struct ieee80211_local *local);
void ieee80211_wep_init(struct ieee80211_local *local);
int ieee80211_wep_encrypt_data(struct arc4_ctx *ctx, u8 *rc4key,
size_t klen, u8 *data, size_t data_len);
int ieee80211_wep_encrypt(struct ieee80211_local *local,