.. | .. |
---|
117 | 117 | |
---|
118 | 118 | /* Check to make sure the MSD is running */ |
---|
119 | 119 | if (!((wlandev->msdstate == WLAN_MSD_HWPRESENT && |
---|
120 | | - msg->msgcode == DIDmsg_lnxreq_ifstate) || |
---|
| 120 | + msg->msgcode == DIDMSG_LNXREQ_IFSTATE) || |
---|
121 | 121 | wlandev->msdstate == WLAN_MSD_RUNNING || |
---|
122 | 122 | wlandev->msdstate == WLAN_MSD_FWLOAD)) { |
---|
123 | 123 | return -ENODEV; |
---|
.. | .. |
---|
125 | 125 | |
---|
126 | 126 | /* Check Permissions */ |
---|
127 | 127 | if (!capable(CAP_NET_ADMIN) && |
---|
128 | | - (msg->msgcode != DIDmsg_dot11req_mibget)) { |
---|
| 128 | + (msg->msgcode != DIDMSG_DOT11REQ_MIBGET)) { |
---|
129 | 129 | netdev_err(wlandev->netdev, |
---|
130 | 130 | "%s: only dot11req_mibget allowed for non-root.\n", |
---|
131 | 131 | wlandev->name); |
---|
.. | .. |
---|
172 | 172 | struct p80211msg *msg) |
---|
173 | 173 | { |
---|
174 | 174 | switch (msg->msgcode) { |
---|
175 | | - case DIDmsg_lnxreq_hostwep:{ |
---|
| 175 | + case DIDMSG_LNXREQ_HOSTWEP: { |
---|
176 | 176 | struct p80211msg_lnxreq_hostwep *req = |
---|
177 | 177 | (struct p80211msg_lnxreq_hostwep *)msg; |
---|
178 | 178 | wlandev->hostwep &= |
---|
.. | .. |
---|
182 | 182 | if (req->encrypt.data == P80211ENUM_truth_true) |
---|
183 | 183 | wlandev->hostwep |= HOSTWEP_ENCRYPT; |
---|
184 | 184 | |
---|
185 | | - break; |
---|
| 185 | + break; |
---|
186 | 186 | } |
---|
187 | | - case DIDmsg_dot11req_mibget: |
---|
188 | | - case DIDmsg_dot11req_mibset:{ |
---|
189 | | - int isget = (msg->msgcode == DIDmsg_dot11req_mibget); |
---|
| 187 | + case DIDMSG_DOT11REQ_MIBGET: |
---|
| 188 | + case DIDMSG_DOT11REQ_MIBSET: { |
---|
| 189 | + int isget = (msg->msgcode == DIDMSG_DOT11REQ_MIBGET); |
---|
190 | 190 | struct p80211msg_dot11req_mibget *mib_msg = |
---|
191 | 191 | (struct p80211msg_dot11req_mibget *)msg; |
---|
192 | 192 | p80211req_mibset_mibget(wlandev, mib_msg, isget); |
---|
193 | | - break; |
---|
| 193 | + break; |
---|
194 | 194 | } |
---|
195 | 195 | } /* switch msg->msgcode */ |
---|
196 | 196 | } |
---|
.. | .. |
---|
205 | 205 | u8 *key = mibitem->data + sizeof(struct p80211pstrd); |
---|
206 | 206 | |
---|
207 | 207 | switch (mibitem->did) { |
---|
208 | | - case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(1): |
---|
209 | | - case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(2): |
---|
210 | | - case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(3): |
---|
211 | | - case DIDmib_dot11smt_dot11WEPDefaultKeysTable_key(4): |
---|
| 208 | + case didmib_dot11smt_wepdefaultkeystable_key(1): |
---|
| 209 | + case didmib_dot11smt_wepdefaultkeystable_key(2): |
---|
| 210 | + case didmib_dot11smt_wepdefaultkeystable_key(3): |
---|
| 211 | + case didmib_dot11smt_wepdefaultkeystable_key(4): |
---|
212 | 212 | if (!isget) |
---|
213 | 213 | wep_change_key(wlandev, |
---|
214 | 214 | P80211DID_ITEM(mibitem->did) - 1, |
---|
215 | 215 | key, pstr->len); |
---|
216 | 216 | break; |
---|
217 | 217 | |
---|
218 | | - case DIDmib_dot11smt_dot11PrivacyTable_dot11WEPDefaultKeyID:{ |
---|
| 218 | + case DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID: { |
---|
219 | 219 | u32 *data = (u32 *)mibitem->data; |
---|
220 | 220 | |
---|
221 | 221 | if (isget) { |
---|
.. | .. |
---|
224 | 224 | wlandev->hostwep &= ~(HOSTWEP_DEFAULTKEY_MASK); |
---|
225 | 225 | wlandev->hostwep |= (*data & HOSTWEP_DEFAULTKEY_MASK); |
---|
226 | 226 | } |
---|
227 | | - break; |
---|
| 227 | + break; |
---|
228 | 228 | } |
---|
229 | | - case DIDmib_dot11smt_dot11PrivacyTable_dot11PrivacyInvoked:{ |
---|
| 229 | + case DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED: { |
---|
230 | 230 | u32 *data = (u32 *)mibitem->data; |
---|
231 | 231 | |
---|
232 | 232 | p80211req_handle_action(wlandev, data, isget, |
---|
233 | 233 | HOSTWEP_PRIVACYINVOKED); |
---|
234 | | - break; |
---|
| 234 | + break; |
---|
235 | 235 | } |
---|
236 | | - case DIDmib_dot11smt_dot11PrivacyTable_dot11ExcludeUnencrypted:{ |
---|
| 236 | + case DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED: { |
---|
237 | 237 | u32 *data = (u32 *)mibitem->data; |
---|
238 | 238 | |
---|
239 | 239 | p80211req_handle_action(wlandev, data, isget, |
---|
240 | 240 | HOSTWEP_EXCLUDEUNENCRYPTED); |
---|
241 | | - break; |
---|
| 241 | + break; |
---|
242 | 242 | } |
---|
243 | 243 | } |
---|
244 | 244 | } |
---|