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

Commit 8f617541 authored Apr 13, 2010 by Giuseppe CAVALLARO Committed by David S. Miller Apr 14, 2010

stmmac: fix vlan support setup



Moved STMMAC_VLAN_TAG_USED from stmmac.h to common.h header
because it is used within the device and descriptor cores.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3d90c508

drivers/net/stmmac/common.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,11 @@
		*******************************************************************************/

		#include <linux/netdevice.h>
		#if defined(CONFIG_VLAN_8021Q) \|\| defined(CONFIG_VLAN_8021Q_MODULE)
		#define STMMAC_VLAN_TAG_USED
		#include <linux/if_vlan.h>
		#endif

		#include "descs.h"

		#undef CHIP_DEBUG_PRINT

drivers/net/stmmac/stmmac.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -23,11 +23,6 @@
		#define DRV_MODULE_VERSION "Jan_2010"
		#include <linux/stmmac.h>

		#if defined(CONFIG_VLAN_8021Q) \|\| defined(CONFIG_VLAN_8021Q_MODULE)
		#define STMMAC_VLAN_TAG_USED
		#include <linux/if_vlan.h>
		#endif

		#include "common.h"
		#ifdef CONFIG_STMMAC_TIMER
		#include "stmmac_timer.h"