The following commit has been merged in the merge/master branch: commit e2c48f277c7a5ceb22da5414e9e0599091b52bb6 Author: Sven Eckelmann sven.eckelmann@open-mesh.com Date: Fri Apr 1 11:37:14 2016 +0200
batman-adv: Fix checkpatch warning about 'unsigned' type
checkpatch.pl warns about the use of 'unsigned' as a short form for 'unsigned int'.
Signed-off-by: Sven Eckelmann sven.eckelmann@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 910c841..65536db 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -452,7 +452,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb, /* To avoid merge and refragmentation at next-hops we never send * fragments larger than BATADV_FRAG_MAX_FRAG_SIZE */ - mtu = min_t(unsigned, mtu, BATADV_FRAG_MAX_FRAG_SIZE); + mtu = min_t(unsigned int, mtu, BATADV_FRAG_MAX_FRAG_SIZE); max_fragment_size = mtu - header_size; max_packet_size = max_fragment_size * BATADV_FRAG_MAX_FRAGMENTS;