diff options
| -rw-r--r-- | net/dsa/tag_brcm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c index 9890097a85d9..d52db5f2c721 100644 --- a/net/dsa/tag_brcm.c +++ b/net/dsa/tag_brcm.c | |||
| @@ -55,6 +55,9 @@ | |||
| 55 | #define BRCM_EG_TC_MASK 0x7 | 55 | #define BRCM_EG_TC_MASK 0x7 |
| 56 | #define BRCM_EG_PID_MASK 0x1f | 56 | #define BRCM_EG_PID_MASK 0x1f |
| 57 | 57 | ||
| 58 | #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM) || \ | ||
| 59 | IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND) | ||
| 60 | |||
| 58 | static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb, | 61 | static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb, |
| 59 | struct net_device *dev, | 62 | struct net_device *dev, |
| 60 | unsigned int offset) | 63 | unsigned int offset) |
| @@ -139,8 +142,9 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb, | |||
| 139 | 142 | ||
| 140 | return skb; | 143 | return skb; |
| 141 | } | 144 | } |
| 145 | #endif | ||
| 142 | 146 | ||
| 143 | #ifdef CONFIG_NET_DSA_TAG_BRCM | 147 | #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM) |
| 144 | static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, | 148 | static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, |
| 145 | struct net_device *dev) | 149 | struct net_device *dev) |
| 146 | { | 150 | { |
| @@ -179,7 +183,7 @@ DSA_TAG_DRIVER(brcm_netdev_ops); | |||
| 179 | MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM); | 183 | MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM); |
| 180 | #endif | 184 | #endif |
| 181 | 185 | ||
| 182 | #ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND | 186 | #if IS_ENABLED(CONFIG_NET_DSA_TAG_BRCM_PREPEND) |
| 183 | static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb, | 187 | static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb, |
| 184 | struct net_device *dev) | 188 | struct net_device *dev) |
| 185 | { | 189 | { |
