Merge branch 'drm-next' of ../main_line/linux-drm into dave-drm-next

[firefly-linux-kernel-4.4.55.git] / net / ax25 / ax25_ip.c

diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index 846ae4e2b115ea484a86f811dad504ed0099329f..67de6b33f2c309ad4426b2075b1bd16d8ce27e11 100644 (file)
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -48,7 +48,7 @@
 
 int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
                     unsigned short type, const void *daddr,
-                    const void *saddr, unsigned len)
+                    const void *saddr, unsigned int len)
 {
        unsigned char *buff;
 
@@ -219,7 +219,7 @@ put:
 
 int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
                     unsigned short type, const void *daddr,
-                    const void *saddr, unsigned len)
+                    const void *saddr, unsigned int len)
 {
        return -AX25_HEADER_LEN;
 }