Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / 802 / hippi.c

diff --git a/net/802/hippi.c b/net/802/hippi.c
index 056794e6637536c043f1de97a331d090e5f9c7a6..51a1f530417d35f9d99e18abf7152934cdea1e77 100644 (file)
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -45,7 +45,7 @@
 
 static int hippi_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)
 {
        struct hippi_hdr *hip = (struct hippi_hdr *)skb_push(skb, HIPPI_HLEN);
        struct hippi_cb *hcb = (struct hippi_cb *) skb->cb;