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

Commit c09240ac authored Dec 22, 2010 by Arend van Spriel Committed by Greg Kroah-Hartman Jan 20, 2011

staging: brcm80211: move definition of ETHER_TYPE_BRCM to source file



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>

parent 541f05fe

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#include <wl_cfg80211.h>

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

drivers/staging/brcm80211/include/bcmcdc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */