aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c527.c
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/3c527.c
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/3c527.c')
-rw-r--r--drivers/net/3c527.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index d91c3464fe72..36c4191e7bca 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1168,8 +1168,8 @@ static void mc32_rx_ring(struct net_device *dev)
1168 1168
1169 /* Try to save time by avoiding a copy on big frames */ 1169 /* Try to save time by avoiding a copy on big frames */
1170 1170
1171 if ((length > RX_COPYBREAK) 1171 if ((length > RX_COPYBREAK) &&
1172 && ((newskb=dev_alloc_skb(1532)) != NULL)) 1172 ((newskb=dev_alloc_skb(1532)) != NULL))
1173 { 1173 {
1174 skb=lp->rx_ring[rx_ring_tail].skb; 1174 skb=lp->rx_ring[rx_ring_tail].skb;
1175 skb_put(skb, length); 1175 skb_put(skb, length);