From: David S. Miller Date: Wed, 17 Apr 2013 18:18:43 +0000 (-0400) Subject: Merge branch 'tipc-ipoib' X-Git-Tag: v4.13~9653^2~94 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2551c405e886c4ce4732bedaa8559a110a6f373f;p=mirror_ubuntu-bionic-kernel.git Merge branch 'tipc-ipoib' Patrick McHardy says: ==================== The following patchset adds support for running TIPC over InfiniBand. The patchset consists of three parts (+ a minor fix for the ethernet media type): - Preparation: removal of an the unused str2addr callback and move of the bcast_addr from struct tipc_media to struct tipc_bearer. This is necessary because InfiniBand doesn't have a fixed broadcast address like ethernet, so it needs to be initialized with the device's broadcast address when the bearer is enabled - Introduction of a TIPC InfiniBand media type. A new media type is needed to deal with the different address sizes - Support for ETH_P_TIPC in IPoIB Since the last posting I've addressed all feedback I received and rebased to the current net-next tree. I consider these patches ready for merging. Since they mainly affect TIPC code, I'd propose to have them either go through the TIPC tree or through Dave directly (not sure how TIPC patches are managed). ==================== Signed-off-by: David S. Miller --- 2551c405e886c4ce4732bedaa8559a110a6f373f