Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

[karo-tx-linux.git] / net / 802 / fddi.c

diff --git a/net/802/fddi.c b/net/802/fddi.c
index 5ab25cd4314b6f18292c2c34603de70cb955d435..9cda40661e0d300112008fab1c633bb938bac4b6 100644 (file)
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -51,7 +51,7 @@
 
 static int fddi_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)
 {
        int hl = FDDI_K_SNAP_HLEN;
        struct fddihdr *fddi;