Commit 8f617541 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller

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: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d90c508
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
*******************************************************************************/ *******************************************************************************/
#include <linux/netdevice.h> #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" #include "descs.h"
#undef CHIP_DEBUG_PRINT #undef CHIP_DEBUG_PRINT
......
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
#define DRV_MODULE_VERSION "Jan_2010" #define DRV_MODULE_VERSION "Jan_2010"
#include <linux/stmmac.h> #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" #include "common.h"
#ifdef CONFIG_STMMAC_TIMER #ifdef CONFIG_STMMAC_TIMER
#include "stmmac_timer.h" #include "stmmac_timer.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment