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
nexedi
linux
Commits
1a8eb4dc
Commit
1a8eb4dc
authored
Dec 01, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TG3]: Do not set RX_MODE_KEEP_VLAN_TAG when ASF is enabled.
parent
6cd132be
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
drivers/net/tg3.c
drivers/net/tg3.c
+8
-2
No files found.
drivers/net/tg3.c
View file @
1a8eb4dc
...
@@ -5763,13 +5763,19 @@ static void __tg3_set_rx_mode(struct net_device *dev)
...
@@ -5763,13 +5763,19 @@ static void __tg3_set_rx_mode(struct net_device *dev)
rx_mode
=
tp
->
rx_mode
&
~
(
RX_MODE_PROMISC
|
rx_mode
=
tp
->
rx_mode
&
~
(
RX_MODE_PROMISC
|
RX_MODE_KEEP_VLAN_TAG
);
RX_MODE_KEEP_VLAN_TAG
);
/* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG
* flag clear.
*/
#if TG3_VLAN_TAG_USED
#if TG3_VLAN_TAG_USED
if
(
!
tp
->
vlgrp
)
if
(
!
tp
->
vlgrp
&&
!
(
tp
->
tg3_flags
&
TG3_FLAG_ENABLE_ASF
))
rx_mode
|=
RX_MODE_KEEP_VLAN_TAG
;
rx_mode
|=
RX_MODE_KEEP_VLAN_TAG
;
#else
#else
/* By definition, VLAN is disabled always in this
/* By definition, VLAN is disabled always in this
* case.
* case.
*/
*/
if
(
!
(
tp
->
tg3_flags
&
TG3_FLAG_ENABLE_ASF
))
rx_mode
|=
RX_MODE_KEEP_VLAN_TAG
;
rx_mode
|=
RX_MODE_KEEP_VLAN_TAG
;
#endif
#endif
...
...
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