The "superfluous curly braces" removal bothers me a bit - in particular, in ip_gre.c, - } else { + } else IF_ENQUEUE(ifq, m); - } Macros have a nasty habit of sometimes becoming multiple statements. (Admittedly, in this case, since it's a do { ... } while (0), presumably that behavior wouldn't ever happen.)