UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: ks7010: replace some custom defines with the ones in uapi/linux/if_ether.h 

This commit reviews some custom defines changing them for the
globals defined in if_ether header file.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2018-03-20 18:13:13 +01:00 committed by Greg Kroah-Hartman
parent c070406941
commit 38fc31e73c
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/ks7010/eap_packet.h
View File

@ -3,13 +3,10 @@
#define EAP_PACKET_H #define EAP_PACKET_H
#include <linux/compiler.h> #include <linux/compiler.h>
#include <uapi/linux/if_ether.h>
#define WBIT(n) (1 << (n)) #define WBIT(n) (1 << (n))
#ifndef ETH_ALEN
#define ETH_ALEN 6
#endif
#define ETHER_HDR_SIZE 20 #define ETHER_HDR_SIZE 20
struct ether_hdr { struct ether_hdr {
@ -20,9 +17,6 @@ struct ether_hdr {
unsigned char h_command; unsigned char h_command;
unsigned char h_vendor_id[3]; unsigned char h_vendor_id[3];
__be16 h_proto; /* packet type ID field */ __be16 h_proto; /* packet type ID field */
#define ETHER_PROTOCOL_TYPE_EAP 0x888e
#define ETHER_PROTOCOL_TYPE_IP 0x0800
#define ETHER_PROTOCOL_TYPE_ARP 0x0806
/* followed by length octets of data */ /* followed by length octets of data */
} __packed; } __packed;

8
drivers/staging/ks7010/ks_hostif.c
View File

@ -1152,7 +1152,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
eth_proto = ntohs(eth_hdr->h_proto); eth_proto = ntohs(eth_hdr->h_proto);
/* for MIC FAILURE REPORT check */ /* for MIC FAILURE REPORT check */
if (eth_proto == ETHER_PROTOCOL_TYPE_EAP && if (eth_proto == ETH_P_PAE &&
priv->wpa.mic_failure.failure > 0) { priv->wpa.mic_failure.failure > 0) {
aa1x_hdr = (struct ieee802_1x_hdr *)(eth_hdr + 1); aa1x_hdr = (struct ieee802_1x_hdr *)(eth_hdr + 1);
if (aa1x_hdr->type == IEEE802_1X_TYPE_EAPOL_KEY) { if (aa1x_hdr->type == IEEE802_1X_TYPE_EAPOL_KEY) {
@ -1162,7 +1162,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
} }
if (priv->wpa.rsn_enabled && priv->wpa.key[0].key_len) { if (priv->wpa.rsn_enabled && priv->wpa.key[0].key_len) {
if (eth_proto == ETHER_PROTOCOL_TYPE_EAP && if (eth_proto == ETH_P_PAE &&
priv->wpa.key[1].key_len == 0 && priv->wpa.key[1].key_len == 0 &&
priv->wpa.key[2].key_len == 0 && priv->wpa.key[2].key_len == 0 &&
priv->wpa.key[3].key_len == 0) { priv->wpa.key[3].key_len == 0) {
@ -1189,7 +1189,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
} }
} }
} else { } else {
if (eth_proto == ETHER_PROTOCOL_TYPE_EAP) if (eth_proto == ETH_P_PAE)
pp->auth_type = cpu_to_le16((uint16_t)TYPE_AUTH); pp->auth_type = cpu_to_le16((uint16_t)TYPE_AUTH);
else else
pp->auth_type = cpu_to_le16((uint16_t)TYPE_DATA); pp->auth_type = cpu_to_le16((uint16_t)TYPE_DATA);
@ -1206,7 +1206,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb)
send_packet_complete, skb); send_packet_complete, skb);
/* MIC FAILURE REPORT check */ /* MIC FAILURE REPORT check */
if (eth_proto == ETHER_PROTOCOL_TYPE_EAP && if (eth_proto == ETH_P_PAE &&
priv->wpa.mic_failure.failure > 0) { priv->wpa.mic_failure.failure > 0) {
if (keyinfo & WPA_KEY_INFO_ERROR && if (keyinfo & WPA_KEY_INFO_ERROR &&
keyinfo & WPA_KEY_INFO_REQUEST) { keyinfo & WPA_KEY_INFO_REQUEST) {