summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-29 23:34:08 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-29 23:34:08 -0700
commiteec009548e98f6b6d514ff5bb8a8627b8dd17a49 (patch)
treebdce6d53b5a664234bea786aea9c0767377b04bd /include
parent0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff)
downloadlinux-stable-eec009548e98f6b6d514ff5bb8a8627b8dd17a49.tar.gz
linux-stable-eec009548e98f6b6d514ff5bb8a8627b8dd17a49.tar.bz2
linux-stable-eec009548e98f6b6d514ff5bb8a8627b8dd17a49.zip
net: Fix warnings caused by MAX_SKB_FRAGS change.
After commit a715dea3c8e9ef2771c534e05ee1d36f65987e64 ("net: Always allocate at least 16 skb frags regardless of page size"), the value of MAX_SKB_FRAGS can now take on either an "unsigned long" or an "int" value. This causes warnings like: net/packet/af_packet.c: In function ‘tpacket_fill_skb’: net/packet/af_packet.c:948: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 2 has type ‘int’ Fix by forcing the constant to be unsigned long, otherwise we have a situation where the type of a system wide constant is variable. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/skbuff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 239083bfea13..d9e52fa2416d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -126,7 +126,7 @@ struct sk_buff;
* GRO uses frags we allocate at least 16 regardless of page size.
*/
#if (65536/PAGE_SIZE + 2) < 16
-#define MAX_SKB_FRAGS 16
+#define MAX_SKB_FRAGS 16UL
#else
#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)
#endif