Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
8cf0d9d0
Commit
8cf0d9d0
authored
May 25, 2005
by
Committed by
Jeff Garzik
May 25, 2005
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of /spare/repo/netdev-2.6 branch veth
parents
8a75e7d6
b2e0852e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
9 deletions
+23
-9
drivers/net/iseries_veth.c
drivers/net/iseries_veth.c
+23
-9
No files found.
drivers/net/iseries_veth.c
View file @
8cf0d9d0
...
...
@@ -924,7 +924,7 @@ static int veth_transmit_to_one(struct sk_buff *skb, HvLpIndex rlp,
spin_lock_irqsave
(
&
cnx
->
lock
,
flags
);
if
(
!
cnx
->
state
&
VETH_STATE_READY
)
if
(
!
(
cnx
->
state
&
VETH_STATE_READY
)
)
goto
drop
;
if
((
skb
->
len
-
14
)
>
VETH_MAX_MTU
)
...
...
@@ -1023,6 +1023,8 @@ static int veth_start_xmit(struct sk_buff *skb, struct net_device *dev)
lpmask
=
veth_transmit_to_many
(
skb
,
lpmask
,
dev
);
dev
->
trans_start
=
jiffies
;
if
(
!
lpmask
)
{
dev_kfree_skb
(
skb
);
}
else
{
...
...
@@ -1262,13 +1264,18 @@ static void veth_receive(struct veth_lpar_connection *cnx,
vlan
=
skb
->
data
[
9
];
dev
=
veth_dev
[
vlan
];
if
(
!
dev
)
/* Some earlier versions of the driver sent
broadcasts down all connections, even to
lpars that weren't on the relevant vlan.
So ignore packets belonging to a vlan we're
not on. */
if
(
!
dev
)
{
/*
* Some earlier versions of the driver sent
* broadcasts down all connections, even to lpars
* that weren't on the relevant vlan. So ignore
* packets belonging to a vlan we're not on.
* We can also be here if we receive packets while
* the driver is going down, because then dev is NULL.
*/
dev_kfree_skb_irq
(
skb
);
continue
;
}
port
=
(
struct
veth_port
*
)
dev
->
priv
;
dest
=
*
((
u64
*
)
skb
->
data
)
&
0xFFFFFFFFFFFF0000
;
...
...
@@ -1381,18 +1388,25 @@ void __exit veth_module_cleanup(void)
{
int
i
;
vio_unregister_driver
(
&
veth_driver
);
/* Stop the queues first to stop any new packets being sent. */
for
(
i
=
0
;
i
<
HVMAXARCHITECTEDVIRTUALLANS
;
i
++
)
if
(
veth_dev
[
i
])
netif_stop_queue
(
veth_dev
[
i
]);
/* Stop the connections before we unregister the driver. This
* ensures there's no skbs lying around holding the device open. */
for
(
i
=
0
;
i
<
HVMAXARCHITECTEDLPS
;
++
i
)
veth_stop_connection
(
i
);
HvLpEvent_unregisterHandler
(
HvLpEvent_Type_VirtualLan
);
/* Hypervisor callbacks may have scheduled more work while we
* were
destroy
ing connections. Now that we've disconnected from
* were
stop
ing connections. Now that we've disconnected from
* the hypervisor make sure everything's finished. */
flush_scheduled_work
();
vio_unregister_driver
(
&
veth_driver
);
for
(
i
=
0
;
i
<
HVMAXARCHITECTEDLPS
;
++
i
)
veth_destroy_connection
(
i
);
...
...
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