Skip to content

Commit

Permalink
staging: brcm80211: move definition of ETHER_TYPE_BRCM to source file
Browse files Browse the repository at this point in the history
The ethertype BRCM is used in single source file and consequently
move there.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Jan 20, 2011
1 parent 541f05f commit c09240a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@

#include <wl_cfg80211.h>

#define EPI_VERSION_STR "4.218.248.5"
#define EPI_VERSION_STR "4.218.248.5"
#define ETH_P_BRCM 0x886c

#if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
#include <linux/wifi_tiwlan.h>
Expand Down Expand Up @@ -1215,7 +1216,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 (ntoh16(skb->protocol) == ETH_P_BRCM)
dhd_wl_host_event(dhd, &ifidx,
skb_mac_header(skb),
&event, &data);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/include/bcmcdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <proto/ethernet.h>
#include <linux/if_ether.h>

typedef struct cdc_ioctl {
u32 cmd; /* ioctl command value */
Expand Down

0 comments on commit c09240a

Please sign in to comment.