lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 11 Jun 2010 12:12:47 +1000 From: Herbert Xu <herbert@...dor.apana.org.au> To: "Michael S. Tsirkin" <mst@...hat.com>, Qianfeng Zhang <frzhang@...hat.com>, "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org, WANG Cong <amwang@...hat.com>, Stephen Hemminger <shemminger@...tta.com>, Matt Mackall <mpm@...enic.com>, "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com> Subject: [PATCH 5/8] netpoll: Add ndo_netpoll_setup netpoll: Add ndo_netpoll_setup This patch adds ndo_netpoll_setup as the initialisation primitive to complement ndo_netpoll_cleanup. Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au> --- include/linux/netdevice.h | 2 ++ net/core/netpoll.c | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 40291f3..619d3f1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -728,6 +728,8 @@ struct net_device_ops { unsigned short vid); #ifdef CONFIG_NET_POLL_CONTROLLER void (*ndo_poll_controller)(struct net_device *dev); + int (*ndo_netpoll_setup)(struct net_device *dev, + struct netpoll_info *info); void (*ndo_netpoll_cleanup)(struct net_device *dev); #endif int (*ndo_set_vf_mac)(struct net_device *dev, diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 9dcd767..c445896 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -729,6 +729,7 @@ int netpoll_setup(struct netpoll *np) struct net_device *ndev = NULL; struct in_device *in_dev; struct netpoll_info *npinfo; + const struct net_device_ops *ops; unsigned long flags; int err; @@ -828,6 +829,13 @@ int netpoll_setup(struct netpoll *np) INIT_DELAYED_WORK(&npinfo->tx_work, queue_process); atomic_set(&npinfo->refcnt, 1); + + ops = np->dev->netdev_ops; + if (ops->ndo_netpoll_setup) { + err = ops->ndo_netpoll_setup(ndev, npinfo); + if (err) + goto free_npinfo; + } } else { npinfo = ndev->npinfo; atomic_inc(&npinfo->refcnt); @@ -848,6 +856,8 @@ int netpoll_setup(struct netpoll *np) return 0; +free_npinfo: + kfree(npinfo); unlock: rtnl_unlock(); put: -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists