From: David S. Miller Date: Mon, 23 Nov 2015 20:06:40 +0000 (-0500) Subject: Merge branch 'ipmr-cleanups' X-Git-Tag: v4.5-rc1~128^2~259 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=901fb38d5a06fa391ec38f2d673a436b7b6b4e36;p=linux.git Merge branch 'ipmr-cleanups' Nikolay Aleksandrov says: ==================== net: ipmr: cleanups and minor improvements Since I'll have to work with ipmr, I decided to clean it up and do some minor improvements. Functionally there're almost no changes except the SLAB_PANIC removal. Most of the patches just re-design some functions to be clearer and more concise and try to remove the ifdef web that was inside. There's more information in each commit. This is the first set, the end goal is to introduce complete netlink support and control over the mfc and vif devices. I've tried to test all of the setsockopt/getsockopt options, and also made builds with various ipmr kconfig options turned on and off. v2: change patch 7 to keep SLAB_PANIC and just drop the unnecessary null check ==================== Signed-off-by: David S. Miller --- 901fb38d5a06fa391ec38f2d673a436b7b6b4e36