aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/cxgb3
parent3454f835837609d60b29a266e3bd9d701073b060 (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/cxgb3')
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index b1a5a00a78cd..cef3f882e2b6 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2117,19 +2117,19 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
2117 if (t.qset_idx >= SGE_QSETS) 2117 if (t.qset_idx >= SGE_QSETS)
2118 return -EINVAL; 2118 return -EINVAL;
2119 if (!in_range(t.intr_lat, 0, M_NEWTIMER) || 2119 if (!in_range(t.intr_lat, 0, M_NEWTIMER) ||
2120 !in_range(t.cong_thres, 0, 255) || 2120 !in_range(t.cong_thres, 0, 255) ||
2121 !in_range(t.txq_size[0], MIN_TXQ_ENTRIES, 2121 !in_range(t.txq_size[0], MIN_TXQ_ENTRIES,
2122 MAX_TXQ_ENTRIES) || 2122 MAX_TXQ_ENTRIES) ||
2123 !in_range(t.txq_size[1], MIN_TXQ_ENTRIES, 2123 !in_range(t.txq_size[1], MIN_TXQ_ENTRIES,
2124 MAX_TXQ_ENTRIES) || 2124 MAX_TXQ_ENTRIES) ||
2125 !in_range(t.txq_size[2], MIN_CTRL_TXQ_ENTRIES, 2125 !in_range(t.txq_size[2], MIN_CTRL_TXQ_ENTRIES,
2126 MAX_CTRL_TXQ_ENTRIES) || 2126 MAX_CTRL_TXQ_ENTRIES) ||
2127 !in_range(t.fl_size[0], MIN_FL_ENTRIES, 2127 !in_range(t.fl_size[0], MIN_FL_ENTRIES,
2128 MAX_RX_BUFFERS) 2128 MAX_RX_BUFFERS) ||
2129 || !in_range(t.fl_size[1], MIN_FL_ENTRIES, 2129 !in_range(t.fl_size[1], MIN_FL_ENTRIES,
2130 MAX_RX_JUMBO_BUFFERS) 2130 MAX_RX_JUMBO_BUFFERS) ||
2131 || !in_range(t.rspq_size, MIN_RSPQ_ENTRIES, 2131 !in_range(t.rspq_size, MIN_RSPQ_ENTRIES,
2132 MAX_RSPQ_ENTRIES)) 2132 MAX_RSPQ_ENTRIES))
2133 return -EINVAL; 2133 return -EINVAL;
2134 2134
2135 if ((adapter->flags & FULL_INIT_DONE) && t.lro > 0) 2135 if ((adapter->flags & FULL_INIT_DONE) && t.lro > 0)