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
1707be1b
Commit
1707be1b
authored
Mar 02, 2011
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
parents
f3d7bc57
4def99bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
drivers/net/e1000/e1000_osdep.h
drivers/net/e1000/e1000_osdep.h
+2
-1
drivers/net/e1000e/netdev.c
drivers/net/e1000e/netdev.c
+2
-1
drivers/net/igbvf/vf.c
drivers/net/igbvf/vf.c
+1
-1
No files found.
drivers/net/e1000/e1000_osdep.h
View file @
1707be1b
...
...
@@ -42,7 +42,8 @@
#define GBE_CONFIG_RAM_BASE \
((unsigned int)(CONFIG_RAM_BASE + GBE_CONFIG_OFFSET))
#define GBE_CONFIG_BASE_VIRT phys_to_virt(GBE_CONFIG_RAM_BASE)
#define GBE_CONFIG_BASE_VIRT \
((void __iomem *)phys_to_virt(GBE_CONFIG_RAM_BASE))
#define GBE_CONFIG_FLASH_WRITE(base, offset, count, data) \
(iowrite16_rep(base + offset, data, count))
...
...
drivers/net/e1000e/netdev.c
View file @
1707be1b
...
...
@@ -5967,7 +5967,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
/* APME bit in EEPROM is mapped to WUC.APME */
eeprom_data
=
er32
(
WUC
);
eeprom_apme_mask
=
E1000_WUC_APME
;
if
(
eeprom_data
&
E1000_WUC_PHY_WAKE
)
if
((
hw
->
mac
.
type
>
e1000_ich10lan
)
&&
(
eeprom_data
&
E1000_WUC_PHY_WAKE
))
adapter
->
flags2
|=
FLAG2_HAS_PHY_WAKEUP
;
}
else
if
(
adapter
->
flags
&
FLAG_APME_IN_CTRL3
)
{
if
(
adapter
->
flags
&
FLAG_APME_CHECK_PORT_B
&&
...
...
drivers/net/igbvf/vf.c
View file @
1707be1b
...
...
@@ -220,7 +220,7 @@ static u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr)
* The parameter rar_count will usually be hw->mac.rar_entry_count
* unless there are workarounds that change this.
**/
void
e1000_update_mc_addr_list_vf
(
struct
e1000_hw
*
hw
,
static
void
e1000_update_mc_addr_list_vf
(
struct
e1000_hw
*
hw
,
u8
*
mc_addr_list
,
u32
mc_addr_count
,
u32
rar_used_count
,
u32
rar_count
)
{
...
...
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