]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/3.0.23/netpoll-netpoll_poll_dev-should-access-dev-flags.patch
Fix up backported ptrace patch
[thirdparty/kernel/stable-queue.git] / releases / 3.0.23 / netpoll-netpoll_poll_dev-should-access-dev-flags.patch
1 From 187db713d22e1c648991e335400c4a65acfb3fd9 Mon Sep 17 00:00:00 2001
2 From: Eric Dumazet <eric.dumazet@gmail.com>
3 Date: Tue, 14 Feb 2012 10:11:59 +0000
4 Subject: netpoll: netpoll_poll_dev() should access dev->flags
5
6
7 From: Eric Dumazet <eric.dumazet@gmail.com>
8
9 [ Upstream commit 58e05f357a039a94aa36475f8c110256f693a239 ]
10
11 commit 5a698af53f (bond: service netpoll arp queue on master device)
12 tested IFF_SLAVE flag against dev->priv_flags instead of dev->flags
13
14 Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
15 Cc: WANG Cong <amwang@redhat.com>
16 Acked-by: Neil Horman <nhorman@tuxdriver.com>
17 Signed-off-by: David S. Miller <davem@davemloft.net>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19 ---
20 net/core/netpoll.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23 --- a/net/core/netpoll.c
24 +++ b/net/core/netpoll.c
25 @@ -193,7 +193,7 @@ void netpoll_poll_dev(struct net_device
26
27 poll_napi(dev);
28
29 - if (dev->priv_flags & IFF_SLAVE) {
30 + if (dev->flags & IFF_SLAVE) {
31 if (dev->npinfo) {
32 struct net_device *bond_dev = dev->master;
33 struct sk_buff *skb;