net: Fix vlan bitmask changes in EHEA driver.
This driver uses the crummy "| foo" style, putting the logical operation at the beginning of lines. Then when the VLAN tag flag bits got changed the operator ended up at both the end and the beginning of some lines. Fix the build error by having it uniformly use the operator at the end of the line. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
e5905c8352
Коммит
55fbbe46e9
|
@ -3021,12 +3021,12 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
|
|||
dev->netdev_ops = &ehea_netdev_ops;
|
||||
ehea_set_ethtool_ops(dev);
|
||||
|
||||
dev->hw_features = NETIF_F_SG | NETIF_F_TSO
|
||||
| NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX;
|
||||
dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
|
||||
| NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |
|
||||
| NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
|
||||
| NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM;
|
||||
dev->hw_features = NETIF_F_SG | NETIF_F_TSO |
|
||||
NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX;
|
||||
dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO |
|
||||
NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |
|
||||
NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
|
||||
NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM;
|
||||
dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA |
|
||||
NETIF_F_IP_CSUM;
|
||||
dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;
|
||||
|
|
Загрузка…
Ссылка в новой задаче