tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

David S. Miller 55fbbe46 e5905c83

+6 -6
+6 -6
drivers/net/ethernet/ibm/ehea/ehea_main.c
··· 3021 3021 dev->netdev_ops = &ehea_netdev_ops; 3022 3022 ehea_set_ethtool_ops(dev); 3023 3023 3024 - dev->hw_features = NETIF_F_SG | NETIF_F_TSO 3025 - | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX; 3026 - dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO 3027 - | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | 3028 - | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | 3029 - | NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM; 3024 + dev->hw_features = NETIF_F_SG | NETIF_F_TSO | 3025 + NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX; 3026 + dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | 3027 + NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | 3028 + NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | 3029 + NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM; 3030 3030 dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA | 3031 3031 NETIF_F_IP_CSUM; 3032 3032 dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;