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/tulip/pnic2.c | |
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/tulip/pnic2.c')
-rw-r--r-- | drivers/net/tulip/pnic2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/tulip/pnic2.c index f49579128fb5..d8418694bf46 100644 --- a/drivers/net/tulip/pnic2.c +++ b/drivers/net/tulip/pnic2.c | |||
@@ -316,9 +316,9 @@ void pnic2_lnk_change(struct net_device *dev, int csr5) | |||
316 | } | 316 | } |
317 | } | 317 | } |
318 | 318 | ||
319 | if ((tp->nwayset && (csr5 & 0x08000000) | 319 | if ((tp->nwayset && (csr5 & 0x08000000) && |
320 | && (dev->if_port == 3 || dev->if_port == 5) | 320 | (dev->if_port == 3 || dev->if_port == 5) && |
321 | && (csr12 & 2) == 2) || (tp->nway && (csr5 & (TPLnkFail)))) { | 321 | (csr12 & 2) == 2) || (tp->nway && (csr5 & (TPLnkFail)))) { |
322 | 322 | ||
323 | /* Link blew? Maybe restart NWay. */ | 323 | /* Link blew? Maybe restart NWay. */ |
324 | 324 | ||