write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/staging/vt6656/key.c
..
..
@@ -35,7 +35,7 @@
35
35
 
36
36
 static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
37
37
 			   struct ieee80211_key_conf *key, u32 key_type,
38
-			   u32 mode, bool onfly_latch)
38
+			   u32 mode)
39
39
 {
40
40
 	struct vnt_private *priv = hw->priv;
41
41
 	u8 broadcast[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
..
..
@@ -63,20 +63,16 @@
63
63
 	}
64
64
 
65
65
 	switch (key_type) {
66
-		/* fallthrough */
67
66
 	case VNT_KEY_DEFAULTKEY:
68
67
 		/* default key last entry */
69
68
 		entry = MAX_KEY_TABLE - 1;
70
69
 		key->hw_key_idx = entry;
71
-	case VNT_KEY_ALLGROUP:
72
-		key_mode |= VNT_KEY_ALLGROUP;
73
-		if (onfly_latch)
74
-			key_mode |= VNT_KEY_ONFLY_ALL;
70
+		fallthrough;
75
71
 	case VNT_KEY_GROUP_ADDRESS:
76
-		key_mode |= mode;
72
+		key_mode = mode | (mode << 4);
73
+		break;
77
74
 	case VNT_KEY_GROUP:
78
-		key_mode |= (mode << 4);
79
-		key_mode |= VNT_KEY_GROUP;
75
+		key_mode = mode << 4;
80
76
 		break;
81
77
 	case  VNT_KEY_PAIRWISE:
82
78
 		key_mode |= mode;
..
..
@@ -86,8 +82,7 @@
86
82
 		return -EINVAL;
87
83
 	}
88
84
 
89
-	if (onfly_latch)
90
-		key_mode |= VNT_KEY_ONFLY;
85
+	key_mode |= key_type;
91
86
 
92
87
 	if (mode == KEY_CTL_WEP) {
93
88
 		if (key->keylen == WLAN_KEY_LEN_WEP40)
..
..
@@ -96,9 +91,8 @@
96
91
 			key->key[15] |= 0x80;
97
92
 	}
98
93
 
99
-	vnt_mac_set_keyentry(priv, key_mode, entry, key_inx, bssid, key->key);
100
-
101
-	return 0;
94
+	return vnt_mac_set_keyentry(priv, key_mode, entry,
95
+				    key_inx, bssid, key->key);
102
96
 }
103
97
 
104
98
 int vnt_set_keys(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
..
..
@@ -107,28 +101,21 @@
107
101
 	struct vnt_private *priv = hw->priv;
108
102
 	u8 *mac_addr = NULL;
109
103
 	u8 key_dec_mode = 0;
110
-	int ret = 0, u;
111
104
 
112
105
 	if (sta)
113
106
 		mac_addr = &sta->addr[0];
114
107
 
115
108
 	switch (key->cipher) {
116
-	case 0:
117
-		for (u = 0 ; u < MAX_KEY_TABLE; u++)
118
-			vnt_mac_disable_keyentry(priv, u);
119
-		return ret;
120
-
121
109
 	case WLAN_CIPHER_SUITE_WEP40:
122
110
 	case WLAN_CIPHER_SUITE_WEP104:
123
-		for (u = 0; u < MAX_KEY_TABLE; u++)
124
-			vnt_mac_disable_keyentry(priv, u);
125
-
126
111
 		vnt_set_keymode(hw, mac_addr, key, VNT_KEY_DEFAULTKEY,
127
-				KEY_CTL_WEP, true);
112
+				KEY_CTL_WEP);
128
113
 
129
114
 		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
130
115
 
131
-		return ret;
116
+		return vnt_set_keymode(hw, mac_addr, key, VNT_KEY_DEFAULTKEY,
117
+				       KEY_CTL_WEP);
118
+
132
119
 	case WLAN_CIPHER_SUITE_TKIP:
133
120
 		key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
134
121
 		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
..
..
@@ -138,19 +125,20 @@
138
125
 		break;
139
126
 	case WLAN_CIPHER_SUITE_CCMP:
140
127
 		if (priv->local_id <= MAC_REVISION_A1)
141
-			return -EINVAL;
128
+			return -EOPNOTSUPP;
142
129
 
143
130
 		key_dec_mode = KEY_CTL_CCMP;
144
131
 
145
132
 		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
133
+		break;
134
+	default:
135
+		return -EOPNOTSUPP;
146
136
 	}
147
137
 
148
138
 	if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE)
149
-		vnt_set_keymode(hw, mac_addr, key, VNT_KEY_PAIRWISE,
150
-				key_dec_mode, true);
151
-	else
152
-		vnt_set_keymode(hw, mac_addr, key, VNT_KEY_GROUP_ADDRESS,
153
-				key_dec_mode, true);
139
+		return vnt_set_keymode(hw, mac_addr, key, VNT_KEY_PAIRWISE,
140
+				       key_dec_mode);
154
141
 
155
-	return 0;
142
+	return vnt_set_keymode(hw, mac_addr, key,
143
+				VNT_KEY_GROUP_ADDRESS, key_dec_mode);
156
144
 }