# Add ETH_ADDR_LEN macro to avoid including userspace packet.h
s,#include <linux/if_ether\.h>,\n#ifndef ETH_ADDR_LEN \
-#define ETH_ADDR_LEN 6 \n#endif \
-\n#ifndef IFNAMSIZ \n#define IFNAMSIZ 16 \n#endif,
+#define ETH_ADDR_LEN 6 \n#endif,
# Use OVS's own ETH_ADDR_LEN instead of Linux-specific ETH_ALEN.
s/ETH_ALEN/ETH_ADDR_LEN/