aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-12-13 19:57:04 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-16 15:21:30 -0500
commitfcbdbed01633bac6271708d86d569e06ed3e4c34 (patch)
tree5df10a030f115892de4f2bdd107a12f13f680b95 /drivers/staging
parentd7ec915abc98795a4cb88e369e2918696dd0ea01 (diff)
staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
Remove now unused #define. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_linux.c4
-rw-r--r--drivers/staging/brcm80211/include/proto/ethernet.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index ec6202b117f..db450837877 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1034,7 +1034,7 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf)
1034 1034
1035 if (is_multicast_ether_addr(eh->ether_dhost)) 1035 if (is_multicast_ether_addr(eh->ether_dhost))
1036 dhdp->tx_multicast++; 1036 dhdp->tx_multicast++;
1037 if (ntoh16(eh->ether_type) == ETHER_TYPE_802_1X) 1037 if (ntoh16(eh->ether_type) == ETH_P_PAE)
1038 atomic_inc(&dhd->pend_8021x_cnt); 1038 atomic_inc(&dhd->pend_8021x_cnt);
1039 } 1039 }
1040 1040
@@ -1262,7 +1262,7 @@ void dhd_txcomplete(dhd_pub_t *dhdp, struct sk_buff *txp, bool success)
1262 eh = (struct ether_header *)(txp->data); 1262 eh = (struct ether_header *)(txp->data);
1263 type = ntoh16(eh->ether_type); 1263 type = ntoh16(eh->ether_type);
1264 1264
1265 if (type == ETHER_TYPE_802_1X) 1265 if (type == ETH_P_PAE)
1266 atomic_dec(&dhd->pend_8021x_cnt); 1266 atomic_dec(&dhd->pend_8021x_cnt);
1267 1267
1268} 1268}
diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index ad55b565c84..567407de020 100644
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -29,7 +29,6 @@
29#define ETHER_MAX_DATA 1500 29#define ETHER_MAX_DATA 1500
30 30
31#define ETHER_TYPE_BRCM 0x886c 31#define ETHER_TYPE_BRCM 0x886c
32#define ETHER_TYPE_802_1X 0x888e
33 32
34#define ETHER_DEST_OFFSET (0 * ETH_ALEN) 33#define ETHER_DEST_OFFSET (0 * ETH_ALEN)
35#define ETHER_SRC_OFFSET (1 * ETH_ALEN) 34#define ETHER_SRC_OFFSET (1 * ETH_ALEN)