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/ll_temac_main.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/ll_temac_main.c')
-rw-r--r-- | drivers/net/ll_temac_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index f2a197fd47a5..336e7c7a9275 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
@@ -231,8 +231,8 @@ static void temac_set_multicast_list(struct net_device *ndev) | |||
231 | int i; | 231 | int i; |
232 | 232 | ||
233 | mutex_lock(&lp->indirect_mutex); | 233 | mutex_lock(&lp->indirect_mutex); |
234 | if (ndev->flags & (IFF_ALLMULTI | IFF_PROMISC) | 234 | if (ndev->flags & (IFF_ALLMULTI | IFF_PROMISC) || |
235 | || ndev->mc_count > MULTICAST_CAM_TABLE_NUM) { | 235 | ndev->mc_count > MULTICAST_CAM_TABLE_NUM) { |
236 | /* | 236 | /* |
237 | * We must make the kernel realise we had to move | 237 | * We must make the kernel realise we had to move |
238 | * into promisc mode or we start all out war on | 238 | * into promisc mode or we start all out war on |