Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38fc31e7 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

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: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0704069

drivers/staging/ks7010/eap_packet.h

+1 −7
Original line number Diff line number Diff line
@@ -3,13 +3,10 @@ 
#define EAP_PACKET_H



#include <linux/compiler.h>

#include <uapi/linux/if_ether.h>



#define WBIT(n) (1 << (n))



#ifndef ETH_ALEN

#define ETH_ALEN 6

#endif



#define ETHER_HDR_SIZE 20



struct ether_hdr {
@@ -20,9 +17,6 @@ struct ether_hdr { 
	unsigned char h_command;

	unsigned char h_vendor_id[3];

	__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 */

} __packed;

drivers/staging/ks7010/ks_hostif.c

+4 −4
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ int hostif_data_request(struct ks_wlan_private *priv, struct sk_buff *skb) 
	eth_proto = ntohs(eth_hdr->h_proto);



	/* for MIC FAILURE REPORT check */

	if (eth_proto == ETHER_PROTOCOL_TYPE_EAP &&

	if (eth_proto == ETH_P_PAE &&

	    priv->wpa.mic_failure.failure > 0) {

		aa1x_hdr = (struct ieee802_1x_hdr *)(eth_hdr + 1);

		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 (eth_proto == ETHER_PROTOCOL_TYPE_EAP &&

		if (eth_proto == ETH_P_PAE &&

		    priv->wpa.key[1].key_len == 0 &&

		    priv->wpa.key[2].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 {

		if (eth_proto == ETHER_PROTOCOL_TYPE_EAP)

		if (eth_proto == ETH_P_PAE)

			pp->auth_type = cpu_to_le16((uint16_t)TYPE_AUTH);

		else

			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);



	/* MIC FAILURE REPORT check */

	if (eth_proto == ETHER_PROTOCOL_TYPE_EAP &&

	if (eth_proto == ETH_P_PAE &&

	    priv->wpa.mic_failure.failure > 0) {

		if (keyinfo & WPA_KEY_INFO_ERROR &&

		    keyinfo & WPA_KEY_INFO_REQUEST) {