Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9773bb7b
Commit
9773bb7b
authored
22 years ago
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
parents
e170a233
8bae75ef
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
drivers/net/8139cp.c
drivers/net/8139cp.c
+1
-1
drivers/net/8139too.c
drivers/net/8139too.c
+4
-3
No files found.
drivers/net/8139cp.c
View file @
9773bb7b
...
...
@@ -881,7 +881,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
i
++
,
mclist
=
mclist
->
next
)
{
int
bit_nr
=
ether_crc
(
ETH_ALEN
,
mclist
->
dmi_addr
)
>>
26
;
mc_filter
[
bit_nr
>>
5
]
|=
cpu_to_le32
(
1
<<
(
bit_nr
&
31
)
);
mc_filter
[
bit_nr
>>
5
]
|=
1
<<
(
bit_nr
&
31
);
rx_mode
|=
AcceptMulticast
;
}
}
...
...
This diff is collapsed.
Click to expand it.
drivers/net/8139too.c
View file @
9773bb7b
...
...
@@ -3,7 +3,7 @@
8139too.c: A RealTek RTL-8139 Fast Ethernet driver for Linux.
Maintained by Jeff Garzik <jgarzik@mandrakesoft.com>
Copyright 2000
,2001
Jeff Garzik
Copyright 2000
-2002
Jeff Garzik
Much code comes from Donald Becker's rtl8139.c driver,
versions 1.13 and older. This driver was originally based
...
...
@@ -92,7 +92,7 @@
*/
#define DRV_NAME "8139too"
#define DRV_VERSION "0.9.2
4
"
#define DRV_VERSION "0.9.2
5
"
#include <linux/config.h>
...
...
@@ -1008,6 +1008,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
}
else
#endif
tp
->
phys
[
0
]
=
32
;
tp
->
mii
.
phy_id
=
tp
->
phys
[
0
];
/* The lower four bits are the media type. */
option
=
(
board_idx
>=
MAX_UNITS
)
?
0
:
media
[
board_idx
];
...
...
@@ -2427,7 +2428,7 @@ static void __set_rx_mode (struct net_device *dev)
i
++
,
mclist
=
mclist
->
next
)
{
int
bit_nr
=
ether_crc
(
ETH_ALEN
,
mclist
->
dmi_addr
)
>>
26
;
mc_filter
[
bit_nr
>>
5
]
|=
cpu_to_le32
(
1
<<
(
bit_nr
&
31
)
);
mc_filter
[
bit_nr
>>
5
]
|=
1
<<
(
bit_nr
&
31
);
rx_mode
|=
AcceptMulticast
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment