From: Joe Perches <joe@perches.com>
To: linux-kernel@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>,
Henry Ptasinski <henryp@broadcom.com>,
Dowan Kim <dowan@broadcom.com>,
Roland Vossen <rvossen@broadcom.com>,
Arend van Spriel <arend@broadcom.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
linux-wireless@vger.kernel.org, devel@driverdev.osuosl.org
Subject: [PATCH 8/8] staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
Date: Mon, 13 Dec 2010 16:57:04 -0800 [thread overview]
Message-ID: <7206f2d8511a22efa9b165ef7581eb88fa6f6603.1292287726.git.joe@perches.com> (raw)
In-Reply-To: <cover.1292287720.git.joe@perches.com>
Remove now unused #define.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 4 ++--
drivers/staging/brcm80211/include/proto/ethernet.h | 1 -
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 ec6202b..db45083 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)
if (is_multicast_ether_addr(eh->ether_dhost))
dhdp->tx_multicast++;
- if (ntoh16(eh->ether_type) == ETHER_TYPE_802_1X)
+ if (ntoh16(eh->ether_type) == ETH_P_PAE)
atomic_inc(&dhd->pend_8021x_cnt);
}
@@ -1262,7 +1262,7 @@ void dhd_txcomplete(dhd_pub_t *dhdp, struct sk_buff *txp, bool success)
eh = (struct ether_header *)(txp->data);
type = ntoh16(eh->ether_type);
- if (type == ETHER_TYPE_802_1X)
+ if (type == ETH_P_PAE)
atomic_dec(&dhd->pend_8021x_cnt);
}
diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index ad55b56..567407d 100644
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -29,7 +29,6 @@
#define ETHER_MAX_DATA 1500
#define ETHER_TYPE_BRCM 0x886c
-#define ETHER_TYPE_802_1X 0x888e
#define ETHER_DEST_OFFSET (0 * ETH_ALEN)
#define ETHER_SRC_OFFSET (1 * ETH_ALEN)
--
1.7.3.3.398.g0b0cd.dirty
next prev parent reply other threads:[~2010-12-14 0:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 0:56 [PATCH 0/8] staging: brcm80211: Cleanup include/proto/ethernet.h Joe Perches
2010-12-14 0:56 ` [PATCH 1/8] staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR Joe Perches
2010-12-14 0:56 ` [PATCH 2/8] staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr Joe Perches
2010-12-14 0:56 ` [PATCH 3/8] staging: brcm80211: Remove unused ether_<foo> #defines and struct Joe Perches
2010-12-14 0:57 ` [PATCH 4/8] staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr Joe Perches
2010-12-14 0:57 ` [PATCH 5/8] staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN Joe Perches
2010-12-14 0:57 ` [PATCH 6/8] staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN Joe Perches
2010-12-14 0:57 ` [PATCH 7/8] staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines Joe Perches
2010-12-14 0:57 ` Joe Perches [this message]
2010-12-16 10:33 ` [PATCH 0/8] staging: brcm80211: Cleanup include/proto/ethernet.h Arend Van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7206f2d8511a22efa9b165ef7581eb88fa6f6603.1292287726.git.joe@perches.com \
--to=joe@perches.com \
--cc=arend@broadcom.com \
--cc=brudley@broadcom.com \
--cc=devel@driverdev.osuosl.org \
--cc=dowan@broadcom.com \
--cc=gregkh@suse.de \
--cc=henryp@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=rvossen@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®