Merge git://git.infradead.org/users/willy/linux-nvme

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / netrom / nr_dev.c

diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 1c51d7a58f0b0c75a61c9d8b20f71d15485e18bc..743262becd6ef330625672d7ede08c093e8fff86 100644 (file)
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -97,7 +97,7 @@ static int nr_rebuild_header(struct sk_buff *skb)
 
 static int nr_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, NR_NETWORK_LEN + NR_TRANSPORT_LEN);