On Tue, Mar 14, 2017 at 6:06 PM, Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx> wrote: > On Tue, Mar 14, 2017 at 04:39:20PM +0200, Erez Shitrit wrote: > >> >> -static int ipoib_dev_init_default(struct net_device *dev, struct ib_device *ca, >> >> - int port) >> >> +static int ipoib_dev_init_default(struct net_device *dev, >> >> + struct ib_device *hca, int *qp_num) >> >> { >> >> - struct ipoib_dev_priv *priv = netdev_priv(dev); >> >> + struct ipoib_dev_priv *priv = ipoib_priv(dev); >> >> + >> >> + netif_napi_add(dev, &priv->napi, ipoib_poll, NAPI_POLL_WEIGHT); >> > >> > All these 'default' functions are part of the 'rn driver'. They should >> > not be calling ipoib_priv, you said you didn't want ipoib_dev_priv >> > leaking into the drivers. >> >> Do you mean in the name of the function? drma_netdev_init_default >> instead of ipoib_dev_init_default ? > > No, I mean ipoib_priv() should only be called by IPOIB core code and > ipoib_dev_priv() should only be called by code under the rdma_netdev > interface. > > The names you picked are confusing. > > This is the core code priv: > > struct ipoib_dev_priv *priv = ipoib_priv(dev); > > And this is the rdma_netdev priv: > > struct ipoib_rn_default *priv = ipoib_dev_priv(dev) > struct ipoib_rn_mlx5 *priv = ipoib_dev_priv(dev) > > Rename ipoib_dev_priv() to something that doesn't collide with the > structure. OK, will change the function ipoib_dev_priv to something like ipoib_accel_priv > > Move things like priv->napi into ipoib_rn_default, only the stuff > under rdma_netdev should touch NAPI. When no accelerator is around, ipoib should work as before, and the struct struct ipoib_dev_priv is the one who does all datapath and control. > > Try hard not to use 'struct ipoib_dev_priv' inside the callbacks > related to the default rn netdev implementation. OK > > Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html