lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next

Browse Source
This commit is contained in:
Roland Dreier
2009-03-24 20:44:41 -07:00
parent d1fbe04eee 9c3da09917 e538052746 71d98b4628 1aedb7721f 4780c1953f 6b708b3dde a6a47771b1 270b8b8513 9d5ab13325 6432f36684
commit 09f98bafea
50 changed files with 1150 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/infiniband/ulp/ipoib/ipoib_main.c
View File

@@ -660,8 +660,12 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
path = __path_find(dev, phdr->hwaddr + 4);
if (!path || !path->valid) {
if (!path)
int new_path = 0;
if (!path) {
path = path_rec_create(dev, phdr->hwaddr + 4);
new_path = 1;
}
if (path) {
/* put pseudoheader back on for next time */
skb_push(skb, sizeof *phdr);
@@ -669,7 +673,8 @@ static void unicast_arp_send(struct sk_buff *skb, struct net_device *dev,
if (!path->query && path_rec_start(dev, path)) {
spin_unlock_irqrestore(&priv->lock, flags);
path_free(dev, path);
if (new_path)
path_free(dev, path);
return;
} else
__path_add(dev, path);

7
drivers/infiniband/ulp/iser/iser_verbs.c
View File

@@ -401,13 +401,6 @@ static void iser_route_handler(struct rdma_cm_id *cma_id)
if (ret)
goto failure;
iser_dbg("path.mtu is %d setting it to %d\n",
cma_id->route.path_rec->mtu, IB_MTU_1024);
/* we must set the MTU to 1024 as this is what the target is assuming */
if (cma_id->route.path_rec->mtu > IB_MTU_1024)
cma_id->route.path_rec->mtu = IB_MTU_1024;
memset(&conn_param, 0, sizeof conn_param);
conn_param.responder_resources = 4;
conn_param.initiator_depth = 1;