Commit d870596f authored by David S. Miller's avatar David S. Miller

[TIGON3]: Do not reference vlgrp unless TG3_VLAN_TAG_USED is set.

parent b178f368
...@@ -4878,8 +4878,15 @@ static void __tg3_set_rx_mode(struct net_device *dev) ...@@ -4878,8 +4878,15 @@ static void __tg3_set_rx_mode(struct net_device *dev)
rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC | rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC |
RX_MODE_KEEP_VLAN_TAG); RX_MODE_KEEP_VLAN_TAG);
#if TG3_VLAN_TAG_USED
if (!tp->vlgrp) if (!tp->vlgrp)
rx_mode |= RX_MODE_KEEP_VLAN_TAG; rx_mode |= RX_MODE_KEEP_VLAN_TAG;
#else
/* By definition, VLAN is disabled always in this
* case.
*/
rx_mode |= RX_MODE_KEEP_VLAN_TAG;
#endif
if (dev->flags & IFF_PROMISC) { if (dev->flags & IFF_PROMISC) {
/* Promiscuous mode. */ /* Promiscuous mode. */
......
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