diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-08-10 01:24:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-14 14:33:31 -0700 |
| commit | 2899656b494dcd118123af1126826b115c8ea6f9 (patch) | |
| tree | 969d2b4362c2237cb38259f909774dc0a00a7e4d /include | |
| parent | 91fe4a4b9e490a24f6702dd8afe72d8afab6fcdb (diff) | |
| download | linux-stable-2899656b494dcd118123af1126826b115c8ea6f9.tar.gz linux-stable-2899656b494dcd118123af1126826b115c8ea6f9.tar.bz2 linux-stable-2899656b494dcd118123af1126826b115c8ea6f9.zip | |
netpoll: take rcu_read_lock_bh() in netpoll_send_skb_on_dev()
This patch fixes several problems in the call path of
netpoll_send_skb_on_dev():
1. Disable IRQ's before calling netpoll_send_skb_on_dev().
2. All the callees of netpoll_send_skb_on_dev() should use
rcu_dereference_bh() to dereference ->npinfo.
3. Rename arp_reply() to netpoll_arp_reply(), the former is too generic.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netpoll.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 2d178baa49df..61aee86cf21d 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -57,7 +57,10 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb, struct net_device *dev); static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) { + unsigned long flags; + local_irq_save(flags); netpoll_send_skb_on_dev(np, skb, np->dev); + local_irq_restore(flags); } |