[PATCH 6/7] netpoll: use netpoll_rx_on() in netpoll_rx()

2012-07-27 Thread Cong Wang 
The logic of the code is same, just call netpoll_rx_on().

Cc: "David S. Miller" 
Signed-off-by: Cong Wang 
---
 include/linux/netpoll.h |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 36f938c..f654fa3 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -63,6 +63,13 @@ static inline void netpoll_send_skb(struct netpoll *np, 
struct sk_buff *skb)
 
 
 #ifdef CONFIG_NETPOLL
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+   struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
+
+   return npinfo && (!list_empty(>rx_np) || npinfo->rx_flags);
+}
+
 static inline bool netpoll_rx(struct sk_buff *skb)
 {
struct netpoll_info *npinfo;
@@ -70,11 +77,11 @@ static inline bool netpoll_rx(struct sk_buff *skb)
bool ret = false;
 
local_irq_save(flags);
-   npinfo = rcu_dereference_bh(skb->dev->npinfo);
 
-   if (!npinfo || (list_empty(>rx_np) && !npinfo->rx_flags))
+   if (!netpoll_rx_on(skb))
goto out;
 
+   npinfo = rcu_dereference_bh(skb->dev->npinfo);
spin_lock(>rx_lock);
/* check rx_flags again with the lock held */
if (npinfo->rx_flags && __netpoll_rx(skb, npinfo))
@@ -86,13 +93,6 @@ out:
return ret;
 }
 
-static inline int netpoll_rx_on(struct sk_buff *skb)
-{
-   struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
-
-   return npinfo && (!list_empty(>rx_np) || npinfo->rx_flags);
-}
-
 static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
if (!list_empty(>dev->napi_list))
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 6/7] netpoll: use netpoll_rx_on() in netpoll_rx()

2012-07-27 Thread Cong Wang 
The logic of the code is same, just call netpoll_rx_on().

Cc: David S. Miller da...@davemloft.net
Signed-off-by: Cong Wang amw...@redhat.com
---
 include/linux/netpoll.h |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 36f938c..f654fa3 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -63,6 +63,13 @@ static inline void netpoll_send_skb(struct netpoll *np, 
struct sk_buff *skb)
 
 
 #ifdef CONFIG_NETPOLL
+static inline int netpoll_rx_on(struct sk_buff *skb)
+{
+   struct netpoll_info *npinfo = rcu_dereference_bh(skb-dev-npinfo);
+
+   return npinfo  (!list_empty(npinfo-rx_np) || npinfo-rx_flags);
+}
+
 static inline bool netpoll_rx(struct sk_buff *skb)
 {
struct netpoll_info *npinfo;
@@ -70,11 +77,11 @@ static inline bool netpoll_rx(struct sk_buff *skb)
bool ret = false;
 
local_irq_save(flags);
-   npinfo = rcu_dereference_bh(skb-dev-npinfo);
 
-   if (!npinfo || (list_empty(npinfo-rx_np)  !npinfo-rx_flags))
+   if (!netpoll_rx_on(skb))
goto out;
 
+   npinfo = rcu_dereference_bh(skb-dev-npinfo);
spin_lock(npinfo-rx_lock);
/* check rx_flags again with the lock held */
if (npinfo-rx_flags  __netpoll_rx(skb, npinfo))
@@ -86,13 +93,6 @@ out:
return ret;
 }
 
-static inline int netpoll_rx_on(struct sk_buff *skb)
-{
-   struct netpoll_info *npinfo = rcu_dereference_bh(skb-dev-npinfo);
-
-   return npinfo  (!list_empty(npinfo-rx_np) || npinfo-rx_flags);
-}
-
 static inline int netpoll_receive_skb(struct sk_buff *skb)
 {
if (!list_empty(skb-dev-napi_list))
-- 
1.7.7.6

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/