git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_verbs.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index
1d49d16
..
faaf10e
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@
-159,8
+159,8
@@
int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ib_qp_init_attr init_attr = {
.cap = {
struct ipoib_dev_priv *priv = netdev_priv(dev);
struct ib_qp_init_attr init_attr = {
.cap = {
- .max_send_wr =
ipoib_sendq_size
,
- .max_recv_wr =
ipoib_recvq_size
,
+ .max_send_wr =
IPOIB_TX_RING_SIZE
,
+ .max_recv_wr =
IPOIB_RX_RING_SIZE
,
.max_send_sge = 1,
.max_recv_sge = 1
},
.max_send_sge = 1,
.max_recv_sge = 1
},
@@
-175,7
+175,7
@@
int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
}
priv->cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev,
}
priv->cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, dev,
-
ipoib_sendq_size + ipoib_recvq_size
+ 1);
+
IPOIB_TX_RING_SIZE + IPOIB_RX_RING_SIZE
+ 1);
if (IS_ERR(priv->cq)) {
printk(KERN_WARNING "%s: failed to create CQ\n", ca->name);
goto out_free_pd;
if (IS_ERR(priv->cq)) {
printk(KERN_WARNING "%s: failed to create CQ\n", ca->name);
goto out_free_pd;
@@
-251,12
+251,10
@@
void ipoib_event(struct ib_event_handler *handler,
struct ipoib_dev_priv *priv =
container_of(handler, struct ipoib_dev_priv, event_handler);
struct ipoib_dev_priv *priv =
container_of(handler, struct ipoib_dev_priv, event_handler);
- if (record->event == IB_EVENT_PORT_ERR ||
- record->event == IB_EVENT_PKEY_CHANGE ||
- record->event == IB_EVENT_PORT_ACTIVE ||
+ if (record->event == IB_EVENT_PORT_ACTIVE ||
record->event == IB_EVENT_LID_CHANGE ||
record->event == IB_EVENT_SM_CHANGE) {
record->event == IB_EVENT_LID_CHANGE ||
record->event == IB_EVENT_SM_CHANGE) {
- ipoib_dbg(priv, "Port
state chang
e event\n");
-
queue_work(ipoib_workqueue,
&priv->flush_task);
+ ipoib_dbg(priv, "Port
activ
e event\n");
+
schedule_work(
&priv->flush_task);
}
}
}
}