Skip to content

S
Simple PCIe FMC carrier SPEC - Software
Commit bc940832 authored by Adam Wujek's avatar Adam Wujek 💬 Committed by Alessandro Rubini
Browse files
Options

wr_nic: unify xmit spinlock in nic-core.c (spec) 

Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 6950cf63
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
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) ...@@ -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_ep *ep = netdev_priv(dev);
struct wrn_dev *wrn = ep->wrn; struct wrn_dev *wrn = ep->wrn;
struct skb_shared_info *info = skb_shinfo(skb); struct skb_shared_info *info = skb_shinfo(skb);
//unsigned long flags; unsigned long flags;
int desc; int desc;
int id; int id;
int do_stamp = 0; int do_stamp = 0;
...@@ -176,13 +176,12 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -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) */ /* 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); desc = __wrn_alloc_tx_desc(wrn);
id = (wrn->id++) & 0xffff; id = (wrn->id++) & 0xffff;
if (id == 0) if (id == 0) /* 0 cannot be used in the SPEC; irrelevant in WRS */
id = wrn->id++; /* 0 cannot be used in the SPEC */ id = wrn->id++;
spin_unlock_irqrestore(&wrn->lock, flags);
//spin_unlock_irqrestore(&wrn->lock, flags);
if (desc < 0) /* error */ if (desc < 0) /* error */
return desc; return desc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment