tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/addr: Fix resolution of local IPv6 addresses
RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port()
mlx4_core: Add 40GigE device ID
RDMA/iwcm: Don't call provider reject func with irqs disabled
IB: Fix typo in udev rule documentation

Linus Torvalds bd381934 cc9b0b9b

+14 -8
+2 -2
Documentation/infiniband/user_mad.txt
··· 128 128 To create the appropriate character device files automatically with 129 129 udev, a rule like 130 130 131 - KERNEL="umad*", NAME="infiniband/%k" 132 - KERNEL="issm*", NAME="infiniband/%k" 131 + KERNEL=="umad*", NAME="infiniband/%k" 132 + KERNEL=="issm*", NAME="infiniband/%k" 133 133 134 134 can be used. This will create device nodes named 135 135
+1 -1
Documentation/infiniband/user_verbs.txt
··· 58 58 To create the appropriate character device files automatically with 59 59 udev, a rule like 60 60 61 - KERNEL="uverbs*", NAME="infiniband/%k" 61 + KERNEL=="uverbs*", NAME="infiniband/%k" 62 62 63 63 can be used. This will create device nodes named 64 64
+1 -1
drivers/infiniband/core/addr.c
··· 393 393 394 394 for_each_netdev(&init_net, dev) 395 395 if (ipv6_chk_addr(&init_net, 396 - &((struct sockaddr_in6 *) addr)->sin6_addr, 396 + &((struct sockaddr_in6 *) dst_in)->sin6_addr, 397 397 dev, 1)) 398 398 break; 399 399
+2
drivers/infiniband/core/iwcm.c
··· 362 362 * In either case, must tell the provider to reject. 363 363 */ 364 364 cm_id_priv->state = IW_CM_STATE_DESTROYING; 365 + spin_unlock_irqrestore(&cm_id_priv->lock, flags); 365 366 cm_id->device->iwcm->reject(cm_id, NULL, 0); 367 + spin_lock_irqsave(&cm_id_priv->lock, flags); 366 368 break; 367 369 case IW_CM_STATE_CONN_SENT: 368 370 case IW_CM_STATE_DESTROYING:
+7 -4
drivers/infiniband/hw/cxgb3/iwch_provider.c
··· 1199 1199 props->state = IB_PORT_DOWN; 1200 1200 else { 1201 1201 inetdev = in_dev_get(netdev); 1202 - if (inetdev->ifa_list) 1203 - props->state = IB_PORT_ACTIVE; 1204 - else 1202 + if (inetdev) { 1203 + if (inetdev->ifa_list) 1204 + props->state = IB_PORT_ACTIVE; 1205 + else 1206 + props->state = IB_PORT_INIT; 1207 + in_dev_put(inetdev); 1208 + } else 1205 1209 props->state = IB_PORT_INIT; 1206 - in_dev_put(inetdev); 1207 1210 } 1208 1211 1209 1212 props->port_cap_flags =
+1
drivers/net/mlx4/main.c
··· 1282 1282 { PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */ 1283 1283 { PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */ 1284 1284 { PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/ 1285 + { PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */ 1285 1286 { 0, } 1286 1287 }; 1287 1288