Skip to contentSkip to conversation

staging: rtl8192e: Fix multiple assignments in rtl_wx.c

PATCH In review Alien Wesley 2 participants 2 messages Aug 29, 2024 Staging

lore
Share & tools
lore

Alien Wesley

author
#0 lore raw

PATCH v5 1/1 staging: rtl8192e: Fix multiple assignments in rtl_wx.c

Separated assignments for pairwise_key_type and group_key_type in order to silence the following checkpatch warning.

CHECK: multiple assignments should be avoided.

Signed-off-by Alien Wesley <[email protected]>

---
V5: Line number removed from subject
v4: Squash v1 and v3
v3: Fix typo in commit message.
v2: Removed two spaces in front of "=".

---
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +2 -1
index fc8e7f73b2a4..67c4793e0fc1 100644
@@ -526,7 +526,8 @@ static int _rtl92e_wx_set_enc(struct net_device *dev,
 	mutex_unlock(&priv->wx_mutex);
 
 	if (wrqu->encoding.flags & IW_ENCODE_DISABLED) {
-		ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA;
+		ieee->pairwise_key_type = KEY_TYPE_NA;
+		ieee->group_key_type = KEY_TYPE_NA;
 		rtl92e_cam_reset(dev);
 		memset(priv->rtllib->swcamtable, 0,
 		       sizeof(struct sw_cam_table) * 32);
Signature · 1 line
2.34.1
Tested-by on v5 1/1
#1 lore raw
Quoted 20 lines · Alien Wesley

Separated assignments for pairwise_key_type and group_key_type in order to silence the following checkpatch warning.

CHECK: multiple assignments should be avoided.

Signed-off-by Alien Wesley <[email protected]>

---
V5: Line number removed from subject
v4: Squash v1 and v3
v3: Fix typo in commit message.
v2: Removed two spaces in front of "=".

---
  drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +0 -0
index fc8e7f73b2a4..67c4793e0fc1 100644

drivers/staging/rtl8192e/rtl8192e/rtl_wx.c static int _rtl92e_wx_set_enc(struct net_device *dev, · line 533

Quoted 9 lines
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +2 -1
@@ -526,7 +526,8 @@ static int _rtl92e_wx_set_enc(struct net_device *dev,
  	mutex_unlock(&priv->wx_mutex);
 
  	if (wrqu->encoding.flags & IW_ENCODE_DISABLED) {
-		ieee->pairwise_key_type = ieee->group_key_type = KEY_TYPE_NA;
+		ieee->pairwise_key_type = KEY_TYPE_NA;
+		ieee->group_key_type = KEY_TYPE_NA;
  		rtl92e_cam_reset(dev);
  		memset(priv->rtllib->swcamtable, 0,
  		       sizeof(struct sw_cam_table) * 32);
Tested-by Philipp Hortmann <[email protected]>