Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1048aff authored by Erez Shitrit's avatar Erez Shitrit Committed by Doug Ledford
Browse files

IB/IPoIB: Use defined function for netdev_priv function 



Make ipoib_priv point to netdev_priv where the code calls netdev_priv.

Signed-off-by: default avatarErez Shitrit <erezsh@mellanox.com>
Reviewed-by: default avatarAlex Vesker <valex@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 10adcbd2

drivers/infiniband/ulp/ipoib/ipoib.h

+7 −4
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ static inline void skb_add_pseudo_hdr(struct sk_buff *skb) 
	skb_pull(skb, IPOIB_HARD_LEN);

}



/* Keep the refactoring compile able */

#define ipoib_priv netdev_priv



/* Used for all multicast joins (broadcast, IPv4 mcast and IPv6 mcast) */

struct ipoib_mcast {

	struct ib_sa_mcmember_rec mcmember;
@@ -608,14 +611,14 @@ extern int ipoib_max_conn_qp; 


static inline int ipoib_cm_admin_enabled(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	return IPOIB_CM_SUPPORTED(dev->dev_addr) &&

		test_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);

}



static inline int ipoib_cm_enabled(struct net_device *dev, u8 *hwaddr)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	return IPOIB_CM_SUPPORTED(hwaddr) &&

		test_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);

}
@@ -638,13 +641,13 @@ static inline void ipoib_cm_set(struct ipoib_neigh *neigh, struct ipoib_cm_tx *t 


static inline int ipoib_cm_has_srq(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	return !!priv->cm.srq;

}



static inline unsigned int ipoib_cm_max_mtu(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	return priv->cm.max_cm_mtu;

}

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+34 −33
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static void ipoib_cm_dma_unmap_rx(struct ipoib_dev_priv *priv, int frags, 


static int ipoib_cm_post_receive_srq(struct net_device *dev, int id)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_recv_wr *bad_wr;

	int i, ret;
@@ -118,7 +118,7 @@ static int ipoib_cm_post_receive_nonsrq(struct net_device *dev, 
					struct ib_recv_wr *wr,

					struct ib_sge *sge, int id)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_recv_wr *bad_wr;

	int i, ret;
@@ -145,7 +145,7 @@ static struct sk_buff *ipoib_cm_alloc_rx_skb(struct net_device *dev, 
					     u64 mapping[IPOIB_CM_RX_SG],

					     gfp_t gfp)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct sk_buff *skb;

	int i;
@@ -196,7 +196,7 @@ static struct sk_buff *ipoib_cm_alloc_rx_skb(struct net_device *dev, 
static void ipoib_cm_free_rx_ring(struct net_device *dev,

				  struct ipoib_cm_rx_buf *rx_ring)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int i;



	for (i = 0; i < ipoib_recvq_size; ++i)
@@ -235,7 +235,7 @@ static void ipoib_cm_start_rx_drain(struct ipoib_dev_priv *priv) 
static void ipoib_cm_rx_event_handler(struct ib_event *event, void *ctx)

{

	struct ipoib_cm_rx *p = ctx;

	struct ipoib_dev_priv *priv = netdev_priv(p->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(p->dev);

	unsigned long flags;



	if (event->event != IB_EVENT_QP_LAST_WQE_REACHED)
@@ -251,7 +251,7 @@ static void ipoib_cm_rx_event_handler(struct ib_event *event, void *ctx) 
static struct ib_qp *ipoib_cm_create_rx_qp(struct net_device *dev,

					   struct ipoib_cm_rx *p)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_qp_init_attr attr = {

		.event_handler = ipoib_cm_rx_event_handler,

		.send_cq = priv->recv_cq, /* For drain WR */
@@ -276,7 +276,7 @@ static int ipoib_cm_modify_rx_qp(struct net_device *dev, 
				 struct ib_cm_id *cm_id, struct ib_qp *qp,

				 unsigned psn)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_qp_attr qp_attr;

	int qp_attr_mask, ret;
@@ -331,7 +331,7 @@ static void ipoib_cm_init_rx_wr(struct net_device *dev, 
				struct ib_recv_wr *wr,

				struct ib_sge *sge)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int i;



	for (i = 0; i < priv->cm.num_frags; ++i)
@@ -349,7 +349,7 @@ static void ipoib_cm_init_rx_wr(struct net_device *dev, 
static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_id,

				   struct ipoib_cm_rx *rx)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct {

		struct ib_recv_wr wr;

		struct ib_sge sge[IPOIB_CM_RX_SG];
@@ -422,7 +422,7 @@ static int ipoib_cm_send_rep(struct net_device *dev, struct ib_cm_id *cm_id, 
			     struct ib_qp *qp, struct ib_cm_req_event_param *req,

			     unsigned psn)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_data data = {};

	struct ib_cm_rep_param rep = {};
@@ -442,7 +442,7 @@ static int ipoib_cm_send_rep(struct net_device *dev, struct ib_cm_id *cm_id, 
static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)

{

	struct net_device *dev = cm_id->context;

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_rx *p;

	unsigned psn;

	int ret;
@@ -515,7 +515,7 @@ static int ipoib_cm_rx_handler(struct ib_cm_id *cm_id, 
		/* Fall through */

	case IB_CM_REJ_RECEIVED:

		p = cm_id->context;

		priv = netdev_priv(p->dev);

		priv = ipoib_priv(p->dev);

		if (ib_modify_qp(p->qp, &ipoib_cm_err_attr, IB_QP_STATE))

			ipoib_warn(priv, "unable to move qp to error state\n");

		/* Fall through */
@@ -559,7 +559,7 @@ static void skb_put_frags(struct sk_buff *skb, unsigned int hdr_space, 


void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_rx_buf *rx_ring;

	unsigned int wr_id = wc->wr_id & ~(IPOIB_OP_CM | IPOIB_OP_RECV);

	struct sk_buff *skb, *newskb;
@@ -708,7 +708,7 @@ static inline int post_send(struct ipoib_dev_priv *priv, 


void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_tx *tx)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_tx_buf *tx_req;

	int rc;

	unsigned usable_sge = tx->max_send_sge - !!skb_headlen(skb);
@@ -786,7 +786,7 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_ 


void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_tx *tx = wc->qp->qp_context;

	unsigned int wr_id = wc->wr_id & ~IPOIB_OP_CM;

	struct ipoib_tx_buf *tx_req;
@@ -855,7 +855,7 @@ void ipoib_cm_handle_tx_wc(struct net_device *dev, struct ib_wc *wc) 


int ipoib_cm_dev_open(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int ret;



	if (!IPOIB_CM_SUPPORTED(dev->dev_addr))
@@ -887,7 +887,7 @@ int ipoib_cm_dev_open(struct net_device *dev) 


static void ipoib_cm_free_rx_reap_list(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_rx *rx, *n;

	LIST_HEAD(list);
@@ -910,7 +910,7 @@ static void ipoib_cm_free_rx_reap_list(struct net_device *dev) 


void ipoib_cm_dev_stop(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_rx *p;

	unsigned long begin;

	int ret;
@@ -969,7 +969,7 @@ void ipoib_cm_dev_stop(struct net_device *dev) 
static int ipoib_cm_rep_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)

{

	struct ipoib_cm_tx *p = cm_id->context;

	struct ipoib_dev_priv *priv = netdev_priv(p->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(p->dev);

	struct ipoib_cm_data *data = event->private_data;

	struct sk_buff_head skqueue;

	struct ib_qp_attr qp_attr;
@@ -1037,7 +1037,7 @@ static int ipoib_cm_rep_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even 


static struct ib_qp *ipoib_cm_create_tx_qp(struct net_device *dev, struct ipoib_cm_tx *tx)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_qp_init_attr attr = {

		.send_cq		= priv->recv_cq,

		.recv_cq		= priv->recv_cq,
@@ -1070,7 +1070,7 @@ static int ipoib_cm_send_req(struct net_device *dev, 
			     u32 qpn,

			     struct ib_sa_path_rec *pathrec)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_data data = {};

	struct ib_cm_req_param req = {};
@@ -1105,7 +1105,7 @@ static int ipoib_cm_send_req(struct net_device *dev, 
static int ipoib_cm_modify_tx_init(struct net_device *dev,

				  struct ib_cm_id *cm_id, struct ib_qp *qp)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_qp_attr qp_attr;

	int qp_attr_mask, ret;

	ret = ib_find_pkey(priv->ca, priv->port, priv->pkey, &qp_attr.pkey_index);
@@ -1130,7 +1130,7 @@ static int ipoib_cm_modify_tx_init(struct net_device *dev, 
static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,

			    struct ib_sa_path_rec *pathrec)

{

	struct ipoib_dev_priv *priv = netdev_priv(p->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(p->dev);

	int ret;



	p->tx_ring = __vmalloc(ipoib_sendq_size * sizeof *p->tx_ring,
@@ -1186,7 +1186,7 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn, 


static void ipoib_cm_tx_destroy(struct ipoib_cm_tx *p)

{

	struct ipoib_dev_priv *priv = netdev_priv(p->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(p->dev);

	struct ipoib_tx_buf *tx_req;

	unsigned long begin;
@@ -1236,7 +1236,7 @@ static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id, 
			       struct ib_cm_event *event)

{

	struct ipoib_cm_tx *tx = cm_id->context;

	struct ipoib_dev_priv *priv = netdev_priv(tx->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(tx->dev);

	struct net_device *dev = priv->dev;

	struct ipoib_neigh *neigh;

	unsigned long flags;
@@ -1287,7 +1287,7 @@ static int ipoib_cm_tx_handler(struct ib_cm_id *cm_id, 
struct ipoib_cm_tx *ipoib_cm_create_tx(struct net_device *dev, struct ipoib_path *path,

				       struct ipoib_neigh *neigh)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_cm_tx *tx;



	tx = kzalloc(sizeof *tx, GFP_ATOMIC);
@@ -1306,7 +1306,7 @@ struct ipoib_cm_tx *ipoib_cm_create_tx(struct net_device *dev, struct ipoib_path 


void ipoib_cm_destroy_tx(struct ipoib_cm_tx *tx)

{

	struct ipoib_dev_priv *priv = netdev_priv(tx->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(tx->dev);

	unsigned long flags;

	if (test_and_clear_bit(IPOIB_FLAG_INITIALIZED, &tx->flags)) {

		spin_lock_irqsave(&priv->lock, flags);
@@ -1441,7 +1441,7 @@ static void ipoib_cm_skb_reap(struct work_struct *work) 
void ipoib_cm_skb_too_long(struct net_device *dev, struct sk_buff *skb,

			   unsigned int mtu)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int e = skb_queue_empty(&priv->cm.skb_queue);



	if (skb_dst(skb))
@@ -1490,7 +1490,8 @@ static void ipoib_cm_stale_task(struct work_struct *work) 
static ssize_t show_mode(struct device *d, struct device_attribute *attr,

			 char *buf)

{

	struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(d));

	struct net_device *dev = to_net_dev(d);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	if (test_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags))

		return sprintf(buf, "connected\n");
@@ -1503,7 +1504,7 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr, 
{

	struct net_device *dev = to_net_dev(d);

	int ret;

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	if (test_bit(IPOIB_FLAG_GOING_DOWN, &priv->flags))

		return -EPERM;
@@ -1532,7 +1533,7 @@ int ipoib_cm_add_mode_attr(struct net_device *dev) 


static void ipoib_cm_create_srq(struct net_device *dev, int max_sge)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_srq_init_attr srq_init_attr = {

		.srq_type = IB_SRQT_BASIC,

		.attr = {
@@ -1561,7 +1562,7 @@ static void ipoib_cm_create_srq(struct net_device *dev, int max_sge) 


int ipoib_cm_dev_init(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int max_srq_sge, i;



	INIT_LIST_HEAD(&priv->cm.passive_ids);
@@ -1622,7 +1623,7 @@ int ipoib_cm_dev_init(struct net_device *dev) 


void ipoib_cm_dev_cleanup(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int ret;



	if (!priv->cm.srq)

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static const struct ipoib_stats ipoib_gstrings_stats[] = { 
static void ipoib_get_drvinfo(struct net_device *netdev,

			      struct ethtool_drvinfo *drvinfo)

{

	struct ipoib_dev_priv *priv = netdev_priv(netdev);

	struct ipoib_dev_priv *priv = ipoib_priv(netdev);



	ib_get_device_fw_str(priv->ca, drvinfo->fw_version,

			     sizeof(drvinfo->fw_version));
@@ -77,7 +77,7 @@ static void ipoib_get_drvinfo(struct net_device *netdev, 
static int ipoib_get_coalesce(struct net_device *dev,

			      struct ethtool_coalesce *coal)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	coal->rx_coalesce_usecs = priv->ethtool.coalesce_usecs;

	coal->rx_max_coalesced_frames = priv->ethtool.max_coalesced_frames;
@@ -88,7 +88,7 @@ static int ipoib_get_coalesce(struct net_device *dev, 
static int ipoib_set_coalesce(struct net_device *dev,

			      struct ethtool_coalesce *coal)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int ret;



	/*

drivers/infiniband/ulp/ipoib/ipoib_fs.c

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static const struct file_operations ipoib_path_fops = { 


void ipoib_create_debug_files(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	char name[IFNAMSIZ + sizeof "_path"];



	snprintf(name, sizeof name, "%s_mcg", dev->name);
@@ -279,7 +279,7 @@ void ipoib_create_debug_files(struct net_device *dev) 


void ipoib_delete_debug_files(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	WARN_ONCE(!priv->mcg_dentry, "null mcg debug file\n");

	WARN_ONCE(!priv->path_dentry, "null path debug file\n");

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+23 −23
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev, 
		ah = (struct ipoib_ah *)vah;

	} else {

		ah->ah = vah;

		ipoib_dbg(netdev_priv(dev), "Created ah %p\n", ah->ah);

		ipoib_dbg(ipoib_priv(dev), "Created ah %p\n", ah->ah);

	}



	return ah;
@@ -80,7 +80,7 @@ struct ipoib_ah *ipoib_create_ah(struct net_device *dev, 
void ipoib_free_ah(struct kref *kref)

{

	struct ipoib_ah *ah = container_of(kref, struct ipoib_ah, ref);

	struct ipoib_dev_priv *priv = netdev_priv(ah->dev);

	struct ipoib_dev_priv *priv = ipoib_priv(ah->dev);



	unsigned long flags;
@@ -99,7 +99,7 @@ static void ipoib_ud_dma_unmap_rx(struct ipoib_dev_priv *priv, 


static int ipoib_ib_post_receive(struct net_device *dev, int id)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_recv_wr *bad_wr;

	int ret;
@@ -121,7 +121,7 @@ static int ipoib_ib_post_receive(struct net_device *dev, int id) 


static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct sk_buff *skb;

	int buf_size;

	u64 *mapping;
@@ -153,7 +153,7 @@ static struct sk_buff *ipoib_alloc_rx_skb(struct net_device *dev, int id) 


static int ipoib_ib_post_receives(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int i;



	for (i = 0; i < ipoib_recvq_size; ++i) {
@@ -172,7 +172,7 @@ static int ipoib_ib_post_receives(struct net_device *dev) 


static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	unsigned int wr_id = wc->wr_id & ~IPOIB_OP_RECV;

	struct sk_buff *skb;

	u64 mapping[IPOIB_UD_RX_SG];
@@ -381,7 +381,7 @@ static void ipoib_qp_state_validate_work(struct work_struct *work) 


static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	unsigned int wr_id = wc->wr_id;

	struct ipoib_tx_buf *tx_req;
@@ -485,14 +485,14 @@ int ipoib_poll(struct napi_struct *napi, int budget) 
void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)

{

	struct net_device *dev = dev_ptr;

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	napi_schedule(&priv->napi);

}



static void drain_tx_cq(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	netif_tx_lock(dev);

	while (poll_tx(priv))
@@ -506,7 +506,7 @@ static void drain_tx_cq(struct net_device *dev) 


void ipoib_send_comp_handler(struct ib_cq *cq, void *dev_ptr)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev_ptr);

	struct ipoib_dev_priv *priv = ipoib_priv(dev_ptr);



	mod_timer(&priv->poll_timer, jiffies);

}
@@ -540,7 +540,7 @@ static inline int post_send(struct ipoib_dev_priv *priv, 
void ipoib_send(struct net_device *dev, struct sk_buff *skb,

		struct ipoib_ah *address, u32 dqpn)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_tx_buf *tx_req;

	int hlen, rc;

	void *phead;
@@ -644,7 +644,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb, 


static void __ipoib_reap_ah(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ipoib_ah *ah, *tah;

	LIST_HEAD(remove_list);

	unsigned long flags;
@@ -678,7 +678,7 @@ void ipoib_reap_ah(struct work_struct *work) 


static void ipoib_flush_ah(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	cancel_delayed_work(&priv->ah_reap_task);

	flush_workqueue(priv->wq);
@@ -687,7 +687,7 @@ static void ipoib_flush_ah(struct net_device *dev) 


static void ipoib_stop_ah(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	set_bit(IPOIB_STOP_REAPER, &priv->flags);

	ipoib_flush_ah(dev);
@@ -695,7 +695,7 @@ static void ipoib_stop_ah(struct net_device *dev) 


static int recvs_pending(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int pending = 0;

	int i;
@@ -708,7 +708,7 @@ static int recvs_pending(struct net_device *dev) 


int ipoib_ib_dev_stop_default(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	struct ib_qp_attr qp_attr;

	unsigned long begin;

	struct ipoib_tx_buf *tx_req;
@@ -799,7 +799,7 @@ void ipoib_ib_tx_timer_func(unsigned long ctx) 


int ipoib_ib_dev_open_default(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int ret;



	ret = ipoib_init_qp(dev);
@@ -833,7 +833,7 @@ int ipoib_ib_dev_open_default(struct net_device *dev) 


int ipoib_ib_dev_open(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	ipoib_pkey_dev_check_presence(dev);
@@ -862,7 +862,7 @@ int ipoib_ib_dev_open(struct net_device *dev) 


void ipoib_pkey_dev_check_presence(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	if (!(priv->pkey & 0x7fff) ||

	    ib_find_pkey(priv->ca, priv->port, priv->pkey,
@@ -874,7 +874,7 @@ void ipoib_pkey_dev_check_presence(struct net_device *dev) 


void ipoib_ib_dev_up(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	ipoib_pkey_dev_check_presence(dev);
@@ -890,7 +890,7 @@ void ipoib_ib_dev_up(struct net_device *dev) 


void ipoib_ib_dev_down(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	ipoib_dbg(priv, "downing ib_dev\n");
@@ -905,7 +905,7 @@ void ipoib_ib_dev_down(struct net_device *dev) 


void ipoib_drain_cq(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);

	int i, n;



	/*
@@ -1219,7 +1219,7 @@ void ipoib_ib_dev_flush_heavy(struct work_struct *work) 


void ipoib_ib_dev_cleanup(struct net_device *dev)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = ipoib_priv(dev);



	ipoib_dbg(priv, "cleaning up ib_dev\n");

	/*