diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/vmxnet3 | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) |
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer.
wireless, wimax, ixgbe, etc are not modified.
Compile tested x86 allyesconfig only
Not all files compiled (not x86 compatible)
Added a few > 80 column lines, which I ignored.
Existing checkpatch complaints ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r-- | drivers/net/vmxnet3/vmxnet3_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index a4c97e786ee5..1ceb9d0f8b97 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c | |||
@@ -1780,8 +1780,8 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter) | |||
1780 | set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_LRO); | 1780 | set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_LRO); |
1781 | devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS); | 1781 | devRead->misc.maxNumRxSG = cpu_to_le16(1 + MAX_SKB_FRAGS); |
1782 | } | 1782 | } |
1783 | if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX) | 1783 | if ((adapter->netdev->features & NETIF_F_HW_VLAN_RX) && |
1784 | && adapter->vlan_grp) { | 1784 | adapter->vlan_grp) { |
1785 | set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_RXVLAN); | 1785 | set_flag_le64(&devRead->misc.uptFeatures, UPT1_F_RXVLAN); |
1786 | } | 1786 | } |
1787 | 1787 | ||