Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[~andy/linux] / net / rose / rose_dev.c

diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 906cc05bba638bf9eba0dc70d4f04c06bf540ea6..28dbdb911b85bf32909e822a27cb50a0edc67d82 100644 (file)
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -37,7 +37,7 @@
 
 static int rose_header(struct sk_buff *skb, struct net_device *dev,
                       unsigned short type,
-                      const void *daddr, const void *saddr, unsigned len)
+                      const void *daddr, const void *saddr, unsigned int len)
 {
        unsigned char *buff = skb_push(skb, ROSE_MIN_LEN + 2);