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/r8169.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/r8169.c')
-rw-r--r-- | drivers/net/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index f6899c3500b5..acfc5a3aa490 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -4763,8 +4763,8 @@ static void rtl_set_rx_mode(struct net_device *dev) | |||
4763 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | | 4763 | AcceptBroadcast | AcceptMulticast | AcceptMyPhys | |
4764 | AcceptAllPhys; | 4764 | AcceptAllPhys; |
4765 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 4765 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
4766 | } else if ((dev->mc_count > multicast_filter_limit) | 4766 | } else if ((dev->mc_count > multicast_filter_limit) || |
4767 | || (dev->flags & IFF_ALLMULTI)) { | 4767 | (dev->flags & IFF_ALLMULTI)) { |
4768 | /* Too many to filter perfectly -- accept all multicasts. */ | 4768 | /* Too many to filter perfectly -- accept all multicasts. */ |
4769 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 4769 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
4770 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 4770 | mc_filter[1] = mc_filter[0] = 0xffffffff; |