diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netpoll.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 479d15c97770..154f9776056c 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h | |||
| @@ -39,7 +39,6 @@ struct netpoll { | |||
| 39 | struct netpoll_info { | 39 | struct netpoll_info { |
| 40 | atomic_t refcnt; | 40 | atomic_t refcnt; |
| 41 | 41 | ||
| 42 | unsigned long rx_flags; | ||
| 43 | spinlock_t rx_lock; | 42 | spinlock_t rx_lock; |
| 44 | struct semaphore dev_lock; | 43 | struct semaphore dev_lock; |
| 45 | struct list_head rx_np; /* netpolls that registered an rx_skb_hook */ | 44 | struct list_head rx_np; /* netpolls that registered an rx_skb_hook */ |
| @@ -99,7 +98,7 @@ static inline bool netpoll_rx_on(struct sk_buff *skb) | |||
| 99 | { | 98 | { |
| 100 | struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo); | 99 | struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo); |
| 101 | 100 | ||
| 102 | return npinfo && (netpoll_rx_processing(npinfo) || npinfo->rx_flags); | 101 | return npinfo && netpoll_rx_processing(npinfo); |
| 103 | } | 102 | } |
| 104 | 103 | ||
| 105 | static inline bool netpoll_rx(struct sk_buff *skb) | 104 | static inline bool netpoll_rx(struct sk_buff *skb) |
