From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 30 Aug 2016 08:19:18 +0200

Nothing much, but we have three little fixes, see below. I've included the
static inline so that BATMAN_ADV_BATMAN_V can be changed to be allowed w/o
cfg80211 sooner, and it's a trivial change.

Let me know if there's any problem.

Pulled, thanks Johannes.