fs/Kconfig: move 9p out

[safe/jmp/linux-2.6] / net / 802 / fddi.c

diff --git a/net/802/fddi.c b/net/802/fddi.c
index 0b98fe2..f1611a1 100644 (file)
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -30,7 +30,6 @@
 #include <asm/system.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/socket.h>
@@ -53,7 +52,7 @@
 
 static int fddi_header(struct sk_buff *skb, struct net_device *dev,
                       unsigned short type,
-                      void *daddr, void *saddr, unsigned len)
+                      const void *daddr, const void *saddr, unsigned len)
 {
        int hl = FDDI_K_SNAP_HLEN;
        struct fddihdr *fddi;
@@ -101,7 +100,7 @@ static int fddi_rebuild_header(struct sk_buff       *skb)
        struct fddihdr *fddi = (struct fddihdr *)skb->data;
 
 #ifdef CONFIG_INET
-       if (fddi->hdr.llc_snap.ethertype == __constant_htons(ETH_P_IP))
+       if (fddi->hdr.llc_snap.ethertype == htons(ETH_P_IP))
                /* Try to get ARP to resolve the header and fill destination address */
                return arp_find(fddi->daddr, skb);
        else
@@ -131,12 +130,13 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
         * to start of packet data.  Assume 802.2 SNAP frames for now.
         */
 
-       skb->mac.raw = skb->data;       /* point to frame control (FC) */
+       skb->dev = dev;
+       skb_reset_mac_header(skb);      /* point to frame control (FC) */
 
        if(fddi->hdr.llc_8022_1.dsap==0xe0)
        {
                skb_pull(skb, FDDI_K_8022_HLEN-3);
-               type = __constant_htons(ETH_P_802_2);
+               type = htons(ETH_P_802_2);
        }
        else
        {
@@ -167,19 +167,27 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
 
 EXPORT_SYMBOL(fddi_type_trans);
 
-static int fddi_change_mtu(struct net_device *dev, int new_mtu)
+int fddi_change_mtu(struct net_device *dev, int new_mtu)
 {
        if ((new_mtu < FDDI_K_SNAP_HLEN) || (new_mtu > FDDI_K_SNAP_DLEN))
                return(-EINVAL);
        dev->mtu = new_mtu;
        return(0);
 }
+EXPORT_SYMBOL(fddi_change_mtu);
+
+static const struct header_ops fddi_header_ops = {
+       .create         = fddi_header,
+       .rebuild        = fddi_rebuild_header,
+};
+
 
 static void fddi_setup(struct net_device *dev)
 {
-       dev->change_mtu         = fddi_change_mtu;
-       dev->hard_header        = fddi_header;
-       dev->rebuild_header     = fddi_rebuild_header;
+       dev->header_ops         = &fddi_header_ops;
+#ifdef CONFIG_COMPAT_NET_DEV_OPS
+       dev->change_mtu         = fddi_change_mtu,
+#endif
 
        dev->type               = ARPHRD_FDDI;
        dev->hard_header_len    = FDDI_K_SNAP_HLEN+3;   /* Assume 802.2 SNAP hdr len + 3 pad bytes */