Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
etherlabmaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ICS Control System Infrastructure
etherlabmaster
Commits
24bb39af
Commit
24bb39af
authored
17 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
Serveral changes on e1000 driver (not tested!).
parent
0111f0b5
No related branches found
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
devices/e1000/e1000_ethtool-2.6.18-ethercat.c
+10
-6
10 additions, 6 deletions
devices/e1000/e1000_ethtool-2.6.18-ethercat.c
devices/e1000/e1000_main-2.6.18-ethercat.c
+182
-144
182 additions, 144 deletions
devices/e1000/e1000_main-2.6.18-ethercat.c
with
192 additions
and
150 deletions
devices/e1000/e1000_ethtool-2.6.18-ethercat.c
+
10
−
6
View file @
24bb39af
...
@@ -146,7 +146,8 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
...
@@ -146,7 +146,8 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
ecmd
->
transceiver
=
XCVR_EXTERNAL
;
ecmd
->
transceiver
=
XCVR_EXTERNAL
;
}
}
if
(
netif_carrier_ok
(
adapter
->
netdev
))
{
if
((
adapter
->
ecdev
&&
ecdev_get_link
(
adapter
->
ecdev
))
||
(
!
adapter
->
ecdev
&&
netif_carrier_ok
(
adapter
->
netdev
)))
{
e1000_get_speed_and_duplex
(
hw
,
&
adapter
->
link_speed
,
e1000_get_speed_and_duplex
(
hw
,
&
adapter
->
link_speed
,
&
adapter
->
link_duplex
);
&
adapter
->
link_duplex
);
...
@@ -204,7 +205,7 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
...
@@ -204,7 +205,7 @@ e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
/* reset the link */
/* reset the link */
if
(
netif_running
(
adapter
->
netdev
))
if
(
adapter
->
ecdev
||
netif_running
(
adapter
->
netdev
))
e1000_reinit_locked
(
adapter
);
e1000_reinit_locked
(
adapter
);
else
else
e1000_reset
(
adapter
);
e1000_reset
(
adapter
);
...
@@ -253,7 +254,7 @@ e1000_set_pauseparam(struct net_device *netdev,
...
@@ -253,7 +254,7 @@ e1000_set_pauseparam(struct net_device *netdev,
hw
->
original_fc
=
hw
->
fc
;
hw
->
original_fc
=
hw
->
fc
;
if
(
adapter
->
fc_autoneg
==
AUTONEG_ENABLE
)
{
if
(
adapter
->
fc_autoneg
==
AUTONEG_ENABLE
)
{
if
(
netif_running
(
adapter
->
netdev
))
if
(
adapter
->
ecdev
||
netif_running
(
adapter
->
netdev
))
e1000_reinit_locked
(
adapter
);
e1000_reinit_locked
(
adapter
);
else
else
e1000_reset
(
adapter
);
e1000_reset
(
adapter
);
...
@@ -277,7 +278,7 @@ e1000_set_rx_csum(struct net_device *netdev, uint32_t data)
...
@@ -277,7 +278,7 @@ e1000_set_rx_csum(struct net_device *netdev, uint32_t data)
struct
e1000_adapter
*
adapter
=
netdev_priv
(
netdev
);
struct
e1000_adapter
*
adapter
=
netdev_priv
(
netdev
);
adapter
->
rx_csum
=
data
;
adapter
->
rx_csum
=
data
;
if
(
netif_running
(
netdev
))
if
(
adapter
->
ecdev
||
netif_running
(
netdev
))
e1000_reinit_locked
(
adapter
);
e1000_reinit_locked
(
adapter
);
else
else
e1000_reset
(
adapter
);
e1000_reset
(
adapter
);
...
@@ -623,6 +624,9 @@ e1000_set_ringparam(struct net_device *netdev,
...
@@ -623,6 +624,9 @@ e1000_set_ringparam(struct net_device *netdev,
struct
e1000_rx_ring
*
rxdr
,
*
rx_old
,
*
rx_new
;
struct
e1000_rx_ring
*
rxdr
,
*
rx_old
,
*
rx_new
;
int
i
,
err
,
tx_ring_size
,
rx_ring_size
;
int
i
,
err
,
tx_ring_size
,
rx_ring_size
;
if
(
adapter
->
ecdev
)
return
-
EBUSY
;
if
((
ring
->
rx_mini_pending
)
||
(
ring
->
rx_jumbo_pending
))
if
((
ring
->
rx_mini_pending
)
||
(
ring
->
rx_jumbo_pending
))
return
-
EINVAL
;
return
-
EINVAL
;
...
@@ -1595,7 +1599,7 @@ e1000_diag_test(struct net_device *netdev,
...
@@ -1595,7 +1599,7 @@ e1000_diag_test(struct net_device *netdev,
struct
ethtool_test
*
eth_test
,
uint64_t
*
data
)
struct
ethtool_test
*
eth_test
,
uint64_t
*
data
)
{
{
struct
e1000_adapter
*
adapter
=
netdev_priv
(
netdev
);
struct
e1000_adapter
*
adapter
=
netdev_priv
(
netdev
);
boolean_t
if_running
=
netif_running
(
netdev
);
boolean_t
if_running
=
adapter
->
ecdev
||
netif_running
(
netdev
);
set_bit
(
__E1000_DRIVER_TESTING
,
&
adapter
->
flags
);
set_bit
(
__E1000_DRIVER_TESTING
,
&
adapter
->
flags
);
if
(
eth_test
->
flags
==
ETH_TEST_FL_OFFLINE
)
{
if
(
eth_test
->
flags
==
ETH_TEST_FL_OFFLINE
)
{
...
@@ -1838,7 +1842,7 @@ static int
...
@@ -1838,7 +1842,7 @@ static int
e1000_nway_reset
(
struct
net_device
*
netdev
)
e1000_nway_reset
(
struct
net_device
*
netdev
)
{
{
struct
e1000_adapter
*
adapter
=
netdev_priv
(
netdev
);
struct
e1000_adapter
*
adapter
=
netdev_priv
(
netdev
);
if
(
netif_running
(
netdev
))
if
(
adapter
->
ecdev
||
netif_running
(
netdev
))
e1000_reinit_locked
(
adapter
);
e1000_reinit_locked
(
adapter
);
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
devices/e1000/e1000_main-2.6.18-ethercat.c
+
182
−
144
View file @
24bb39af
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment