Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Simple PCIe FMC carrier SPEC - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Simple PCIe FMC carrier SPEC - Software
Commits
bc940832
Commit
bc940832
authored
Oct 31, 2014
by
Adam Wujek
💬
Committed by
Alessandro Rubini
Dec 02, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wr_nic: unify xmit spinlock in nic-core.c (spec)
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
6950cf63
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
nic-core.c
kernel/wr_nic/nic-core.c
+5
-6
No files found.
kernel/wr_nic/nic-core.c
View file @
bc940832
...
...
@@ -162,7 +162,7 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct
wrn_ep
*
ep
=
netdev_priv
(
dev
);
struct
wrn_dev
*
wrn
=
ep
->
wrn
;
struct
skb_shared_info
*
info
=
skb_shinfo
(
skb
);
//
unsigned long flags;
unsigned
long
flags
;
int
desc
;
int
id
;
int
do_stamp
=
0
;
...
...
@@ -176,13 +176,12 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
/* Allocate a descriptor and id (start from last allocated) */
//
spin_lock_irqsave(&wrn->lock, flags);
spin_lock_irqsave
(
&
wrn
->
lock
,
flags
);
desc
=
__wrn_alloc_tx_desc
(
wrn
);
id
=
(
wrn
->
id
++
)
&
0xffff
;
if
(
id
==
0
)
id
=
wrn
->
id
++
;
/* 0 cannot be used in the SPEC */
//spin_unlock_irqrestore(&wrn->lock, flags);
if
(
id
==
0
)
/* 0 cannot be used in the SPEC; irrelevant in WRS */
id
=
wrn
->
id
++
;
spin_unlock_irqrestore
(
&
wrn
->
lock
,
flags
);
if
(
desc
<
0
)
/* error */
return
desc
;
...
...
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