| Message ID | 20100506.012051.149835101.davem@davemloft.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, May 6, 2010 at 4:20 PM, David Miller <davem@davemloft.net> wrote: > > Signed-off-by: David S. Miller <davem@davemloft.net> > --- > > I noticed this while validating and auditing Eric Dumazet's vnet > fix... applied to net-next-2.6 > > include/linux/netpoll.h | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h > index 017e604..3688c83 100644 > --- a/include/linux/netpoll.h > +++ b/include/linux/netpoll.h > @@ -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; > + int ret = false; > bool ret = false.
From: Changli Gao <xiaosuo@gmail.com> Date: Thu, 6 May 2010 16:27:44 +0800 > bool ret = false. Thanks for catching that, fixed. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 017e604..3688c83 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -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; + int 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;
Signed-off-by: David S. Miller <davem@davemloft.net> --- I noticed this while validating and auditing Eric Dumazet's vnet fix... applied to net-next-2.6 include/linux/netpoll.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)