Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 194796
b: refs/heads/master
c: ffb2736
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed May 6, 2010
1 parent f9f3664 commit e66b1dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f6dc31a85cd46a959bdd987adad14c3b645e03c1
refs/heads/master: ffb273623bc506d854902a415ef241b79232f93a
8 changes: 4 additions & 4 deletions trunk/include/linux/netpoll.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@ void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);


#ifdef CONFIG_NETPOLL
static inline int netpoll_rx(struct sk_buff *skb)
static inline bool netpoll_rx(struct sk_buff *skb)
{
struct netpoll_info *npinfo = skb->dev->npinfo;
unsigned long flags;
int ret = 0;
bool ret = false;

if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags))
return 0;
return false;

spin_lock_irqsave(&npinfo->rx_lock, flags);
/* check rx_flags again with the lock held */
if (npinfo->rx_flags && __netpoll_rx(skb))
ret = 1;
ret = true;
spin_unlock_irqrestore(&npinfo->rx_lock, flags);

return ret;
Expand Down

0 comments on commit e66b1dc

Please sign in to comment.