From: Jonas Gorski <jonas.gorski@gmail.com>
To: linux-wireless@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>
Subject: [RFT 5/8] staging: brcm80211: Remove ETHER_TYPE_BRCM.
Date: Wed, 19 Jan 2011 23:35:29 +0100 [thread overview]
Message-ID: <1295476532-21130-6-git-send-email-jonas.gorski@gmail.com> (raw)
In-Reply-To: <1295476532-21130-5-git-send-email-jonas.gorski@gmail.com>
Use the recently introduced ETH_P_LINK_CTL instead of ETHER_TYPE_BRCM, and
remove the define.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +-
drivers/staging/brcm80211/include/proto/ethernet.h | 2 --
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 87bf42d..71c5203 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1215,7 +1215,7 @@ void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf,
skb_pull(skb, ETH_HLEN);
/* Process special event packets and then discard them */
- if (ntoh16(skb->protocol) == ETHER_TYPE_BRCM)
+ if (skb->protocol == htons(ETH_P_LINK_CTL))
dhd_wl_host_event(dhd, &ifidx,
skb_mac_header(skb),
&event, &data);
diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h
index bc99842..77deb94 100644
--- a/drivers/staging/brcm80211/include/proto/ethernet.h
+++ b/drivers/staging/brcm80211/include/proto/ethernet.h
@@ -21,8 +21,6 @@
#include <packed_section_start.h>
-#define ETHER_TYPE_BRCM 0x886c
-
BWL_PRE_PACKED_STRUCT struct ether_addr {
u8 octet[ETH_ALEN];
} BWL_POST_PACKED_STRUCT;
--
1.5.6.5
next prev parent reply other threads:[~2011-01-19 22:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-19 22:35 [RFT 0/8] Clean proto/ethernet.h and remove it Jonas Gorski
2011-01-19 22:35 ` [RFT 1/8] staging: brcm80211: Remove unused ETHER_<foo> macros Jonas Gorski
2011-01-19 22:35 ` [RFT 2/8] staging: brcm80211: Use linux ethhdr struct Jonas Gorski
2011-01-19 22:35 ` [RFT 3/8] staging: brcm80211: Remove unused ETHER_<foo> defines Jonas Gorski
2011-01-19 22:35 ` [RFT 4/8] staging: brcm80211: Remove ETHER_MAX_LEN definition Jonas Gorski
2011-01-19 22:35 ` Jonas Gorski [this message]
2011-01-19 22:35 ` [RFT 6/8] staging: brcm80211: Remove static ether_bcast Jonas Gorski
2011-01-19 22:35 ` [RFT 7/8] staging: brcm80211: Replace ether_addr with fixed size array Jonas Gorski
2011-01-19 22:35 ` [RFT 8/8] staging: brcm80211: Remove proto/ethernet.h Jonas Gorski
2011-01-20 8:58 ` [RFT 0/8] Clean proto/ethernet.h and remove it Arend Van Spriel
2011-01-20 11:12 ` Jonas Gorski
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=1295476532-21130-6-git-send-email-jonas.gorski@gmail.com \
--to=jonas.gorski@gmail.com \
--cc=arend@broadcom.com \
--cc=brudley@broadcom.com \
--cc=dowan@broadcom.com \
--cc=henryp@broadcom.com \
--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