Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / net / 802 / fddi.c

diff --git a/net/802/fddi.c b/net/802/fddi.c
index 752d77d..ac242a4 100644 (file)
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -10,7 +10,7 @@
  * Authors:    Lawrence V. Stefani, <stefani@lkg.dec.com>
  *
  *             fddi.c is based on previous eth.c and tr.c work by
- *                     Ross Biro, <bir7@leland.Stanford.Edu>
+ *                     Ross Biro
  *                     Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *                     Mark Evans, <evansmp@uhura.aston.ac.uk>
  *                     Florian La Roche, <rzsfl@rz.uni-sb.de>
@@ -52,8 +52,9 @@
  * daddr=NULL  means leave destination address (eg unresolved arp)
  */
 
-int fddi_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-               void *daddr, void *saddr, unsigned len)
+static int fddi_header(struct sk_buff *skb, struct net_device *dev,
+                      unsigned short type,
+                      void *daddr, void *saddr, unsigned len)
 {
        int hl = FDDI_K_SNAP_HLEN;
        struct fddihdr *fddi;
@@ -96,7 +97,7 @@ int fddi_header(struct sk_buff        *skb, struct net_device *dev, unsigned short type
  * this sk_buff.  We now let ARP fill in the other fields.
  */
  
-int fddi_rebuild_header(struct sk_buff *skb)
+static int fddi_rebuild_header(struct sk_buff  *skb)
 {
        struct fddihdr *fddi = (struct fddihdr *)skb->data;
 
@@ -107,8 +108,8 @@ int fddi_rebuild_header(struct sk_buff      *skb)
        else
 #endif 
        {
-               printk("%s: Don't know how to resolve type %02X addresses.\n",
-                      skb->dev->name, htons(fddi->hdr.llc_snap.ethertype));
+               printk("%s: Don't know how to resolve type %04X addresses.\n",
+                      skb->dev->name, ntohs(fddi->hdr.llc_snap.ethertype));
                return(0);
        }
 }
@@ -121,10 +122,10 @@ int fddi_rebuild_header(struct sk_buff    *skb)
  * the proper pointer to the start of packet data (skb->data).
  */
  
-unsigned short fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
+__be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct fddihdr *fddi = (struct fddihdr *)skb->data;
-       unsigned short type;
+       __be16 type;
        
        /*
         * Set mac.raw field to point to FC byte, set data field to point