[NET]: Convert init_timer into setup_timer
[linux-2.6.git] / net / 802 / tr.c
index a755e88..151855d 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * NET3:       Token ring device handling subroutines
- * 
+ *
  *             This program is free software; you can redistribute it and/or
  *             modify it under the terms of the GNU General Public License
  *             as published by the Free Software Foundation; either version
  *              22 Jun 98 Paul Norton <p.norton@computer.org> Rearranged
  *              tr_header and tr_type_trans to handle passing IPX SNAP and
  *              802.2 through the correct layers. Eliminated tr_reformat.
- *        
+ *
  */
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -37,6 +36,7 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <net/arp.h>
+#include <net/net_namespace.h>
 
 static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev);
 static void rif_check_expire(unsigned long dummy);
@@ -46,7 +46,7 @@ static void rif_check_expire(unsigned long dummy);
 /*
  *     Each RIF entry we learn is kept this way
  */
+
 struct rif_cache {
        unsigned char addr[TR_ALEN];
        int iface;
@@ -63,7 +63,7 @@ struct rif_cache {
  *     We hash the RIF cache 32 ways. We do after all have to look it
  *     up a lot.
  */
+
 static struct rif_cache *rif_table[RIF_TABLE_SIZE];
 
 static DEFINE_SPINLOCK(rif_lock);
@@ -72,7 +72,7 @@ static DEFINE_SPINLOCK(rif_lock);
 /*
  *     Garbage disposal timer.
  */
+
 static struct timer_list rif_timer;
 
 int sysctl_tr_rif_timeout = 60*10*HZ;
@@ -97,16 +97,16 @@ static inline unsigned long rif_hash(const unsigned char *addr)
  *     Put the headers on a token ring packet. Token ring source routing
  *     makes this a little more exciting than on ethernet.
  */
+
 static int tr_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)
 {
        struct trh_hdr *trh;
        int hdr_len;
 
-       /* 
-        * Add the 802.2 SNAP header if IP as the IPv4/IPv6 code calls  
+       /*
+        * Add the 802.2 SNAP header if IP as the IPv4/IPv6 code calls
         * dev->hard_header directly.
         */
        if (type == ETH_P_IP || type == ETH_P_IPV6 || type == ETH_P_ARP)
@@ -124,7 +124,7 @@ static int tr_header(struct sk_buff *skb, struct net_device *dev,
        else
        {
                hdr_len = sizeof(struct trh_hdr);
-               trh = (struct trh_hdr *)skb_push(skb, hdr_len); 
+               trh = (struct trh_hdr *)skb_push(skb, hdr_len);
        }
 
        trh->ac=AC;
@@ -138,23 +138,23 @@ static int tr_header(struct sk_buff *skb, struct net_device *dev,
        /*
         *      Build the destination and then source route the frame
         */
-        
-       if(daddr) 
+
+       if(daddr)
        {
                memcpy(trh->daddr,daddr,dev->addr_len);
-               tr_source_route(skb,trh,dev);
+               tr_source_route(skb, trh, dev);
                return(hdr_len);
        }
 
        return -hdr_len;
 }
-       
+
 /*
  *     A neighbour discovery of some species (eg arp) has completed. We
  *     can now send the packet.
  */
-static int tr_rebuild_header(struct sk_buff *skb) 
+
+static int tr_rebuild_header(struct sk_buff *skb)
 {
        struct trh_hdr *trh=(struct trh_hdr *)skb->data;
        struct trllc *trllc=(struct trllc *)(skb->data+sizeof(struct trh_hdr));
@@ -163,9 +163,9 @@ static int tr_rebuild_header(struct sk_buff *skb)
        /*
         *      FIXME: We don't yet support IPv6 over token rings
         */
-        
+
        if(trllc->ethertype != htons(ETH_P_IP)) {
-               printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n",(unsigned int)htons(trllc->ethertype));
+               printk("tr_rebuild_header: Don't know how to resolve type %04X addresses ?\n", ntohs(trllc->ethertype));
                return 0;
        }
 
@@ -173,39 +173,41 @@ static int tr_rebuild_header(struct sk_buff *skb)
        if(arp_find(trh->daddr, skb)) {
                        return 1;
        }
-       else 
-#endif 
-       {       
-               tr_source_route(skb,trh,dev); 
+       else
+#endif
+       {
+               tr_source_route(skb,trh,dev);
                return 0;
        }
 }
-       
+
 /*
  *     Some of this is a bit hackish. We intercept RIF information
  *     used for source routing. We also grab IP directly and don't feed
  *     it via SNAP.
  */
-unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev) 
+
+__be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
 
-       struct trh_hdr *trh=(struct trh_hdr *)skb->data;
+       struct trh_hdr *trh;
        struct trllc *trllc;
        unsigned riflen=0;
-       
-       skb->mac.raw = skb->data;
-       
-               if(trh->saddr[0] & TR_RII)
+
+       skb->dev = dev;
+       skb_reset_mac_header(skb);
+       trh = tr_hdr(skb);
+
+       if(trh->saddr[0] & TR_RII)
                riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
 
        trllc = (struct trllc *)(skb->data+sizeof(struct trh_hdr)-TR_MAXRIFLEN+riflen);
 
        skb_pull(skb,sizeof(struct trh_hdr)-TR_MAXRIFLEN+riflen);
 
-       if(*trh->daddr & 0x80) 
+       if(*trh->daddr & 0x80)
        {
-               if(!memcmp(trh->daddr,dev->broadcast,TR_ALEN))  
+               if(!memcmp(trh->daddr,dev->broadcast,TR_ALEN))
                        skb->pkt_type=PACKET_BROADCAST;
                else
                        skb->pkt_type=PACKET_MULTICAST;
@@ -214,7 +216,7 @@ unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev)
        {
                skb->pkt_type=PACKET_MULTICAST;
        }
-       else if(dev->flags & IFF_PROMISC) 
+       else if(dev->flags & IFF_PROMISC)
        {
                if(memcmp(trh->daddr, dev->dev_addr, TR_ALEN))
                        skb->pkt_type=PACKET_OTHERHOST;
@@ -222,51 +224,53 @@ unsigned short tr_type_trans(struct sk_buff *skb, struct net_device *dev)
 
        if ((skb->pkt_type != PACKET_BROADCAST) &&
            (skb->pkt_type != PACKET_MULTICAST))
-               tr_add_rif_info(trh,dev) ; 
+               tr_add_rif_info(trh,dev) ;
 
        /*
-        * Strip the SNAP header from ARP packets since we don't 
+        * Strip the SNAP header from ARP packets since we don't
         * pass them through to the 802.2/SNAP layers.
         */
 
        if (trllc->dsap == EXTENDED_SAP &&
-           (trllc->ethertype == ntohs(ETH_P_IP) ||
-            trllc->ethertype == ntohs(ETH_P_IPV6) ||
-            trllc->ethertype == ntohs(ETH_P_ARP)))
+           (trllc->ethertype == htons(ETH_P_IP) ||
+            trllc->ethertype == htons(ETH_P_IPV6) ||
+            trllc->ethertype == htons(ETH_P_ARP)))
        {
                skb_pull(skb, sizeof(struct trllc));
                return trllc->ethertype;
        }
 
-       return ntohs(ETH_P_802_2);
+       return htons(ETH_P_TR_802_2);
 }
 
 /*
- *     We try to do source routing... 
+ *     We try to do source routing...
  */
 
-void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *dev) 
+void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,
+                    struct net_device *dev)
 {
        int slack;
        unsigned int hash;
        struct rif_cache *entry;
        unsigned char *olddata;
-       static const unsigned char mcast_func_addr[] 
+       unsigned long flags;
+       static const unsigned char mcast_func_addr[]
                = {0xC0,0x00,0x00,0x04,0x00,0x00};
-       
-       spin_lock_bh(&rif_lock);
+
+       spin_lock_irqsave(&rif_lock, flags);
 
        /*
-        *      Broadcasts are single route as stated in RFC 1042 
+        *      Broadcasts are single route as stated in RFC 1042
         */
        if( (!memcmp(&(trh->daddr[0]),&(dev->broadcast[0]),TR_ALEN)) ||
            (!memcmp(&(trh->daddr[0]),&(mcast_func_addr[0]), TR_ALEN))  )
        {
-               trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)  
+               trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)
                               | TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
                trh->saddr[0]|=TR_RII;
        }
-       else 
+       else
        {
                hash = rif_hash(trh->daddr);
                /*
@@ -277,17 +281,19 @@ void tr_source_route(struct sk_buff *skb,struct trh_hdr *trh,struct net_device *
                /*
                 *      If we found an entry we can route the frame.
                 */
-               if(entry) 
+               if(entry)
                {
 #if TR_SR_DEBUG
-printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
-                 trh->daddr[1],trh->daddr[2],trh->daddr[3],trh->daddr[4],trh->daddr[5]);
+{
+DECLARE_MAC_BUF(mac);
+printk("source routing for %s\n",print_mac(mac, trh->daddr));
+}
 #endif
                        if(!entry->local_ring && (ntohs(entry->rcf) & TR_RCF_LEN_MASK) >> 8)
                        {
                                trh->rcf=entry->rcf;
                                memcpy(&trh->rseg[0],&entry->rseg[0],8*sizeof(unsigned short));
-                               trh->rcf^=htons(TR_RCF_DIR_BIT);        
+                               trh->rcf^=htons(TR_RCF_DIR_BIT);
                                trh->rcf&=htons(0x1fff);        /* Issam Chehab <ichehab@madge1.demon.co.uk> */
 
                                trh->saddr[0]|=TR_RII;
@@ -301,14 +307,14 @@ printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
                        }
                        entry->last_used=jiffies;
                }
-               else 
+               else
                {
                        /*
                         *      Without the information we simply have to shout
                         *      on the wire. The replies should rapidly clean this
                         *      situation up.
                         */
-                       trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)  
+                       trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)
                                       | TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
                        trh->saddr[0]|=TR_RII;
 #if TR_SR_DEBUG
@@ -320,10 +326,10 @@ printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
        /* Compress the RIF here so we don't have to do it in the driver(s) */
        if (!(trh->saddr[0] & 0x80))
                slack = 18;
-       else 
+       else
                slack = 18 - ((ntohs(trh->rcf) & TR_RCF_LEN_MASK)>>8);
        olddata = skb->data;
-       spin_unlock_bh(&rif_lock);
+       spin_unlock_irqrestore(&rif_lock, flags);
 
        skb_pull(skb, slack);
        memmove(skb->data, olddata, sizeof(struct trh_hdr) - slack);
@@ -333,38 +339,39 @@ printk("source routing for %02X:%02X:%02X:%02X:%02X:%02X\n",trh->daddr[0],
  *     We have learned some new RIF information for our source
  *     routing.
  */
+
 static void tr_add_rif_info(struct trh_hdr *trh, struct net_device *dev)
 {
        unsigned int hash, rii_p = 0;
+       unsigned long flags;
        struct rif_cache *entry;
+       unsigned char saddr0;
 
+       spin_lock_irqsave(&rif_lock, flags);
+       saddr0 = trh->saddr[0];
 
-       spin_lock_bh(&rif_lock);
-       
        /*
         *      Firstly see if the entry exists
         */
 
-               if(trh->saddr[0] & TR_RII)
+       if(trh->saddr[0] & TR_RII)
        {
                trh->saddr[0]&=0x7f;
                if (((ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8) > 2)
                {
                        rii_p = 1;
-               }
+               }
        }
 
        hash = rif_hash(trh->saddr);
        for(entry=rif_table[hash];entry && memcmp(&(entry->addr[0]),&(trh->saddr[0]),TR_ALEN);entry=entry->next);
 
-       if(entry==NULL) 
+       if(entry==NULL)
        {
 #if TR_SR_DEBUG
-printk("adding rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
-               trh->saddr[0],trh->saddr[1],trh->saddr[2],
-                       trh->saddr[3],trh->saddr[4],trh->saddr[5],
-               ntohs(trh->rcf));
+               DECLARE_MAC_BUF(mac);
+               printk("adding rif_entry: addr:%s rcf:%04X\n",
+                      print_mac(mac, trh->saddr), ntohs(trh->rcf));
 #endif
                /*
                 *      Allocate our new entry. A failure to allocate loses
@@ -375,10 +382,10 @@ printk("adding rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
                 */
                entry=kmalloc(sizeof(struct rif_cache),GFP_ATOMIC);
 
-               if(!entry) 
+               if(!entry)
                {
                        printk(KERN_DEBUG "tr.c: Couldn't malloc rif cache entry !\n");
-                       spin_unlock_bh(&rif_lock);
+                       spin_unlock_irqrestore(&rif_lock, flags);
                        return;
                }
 
@@ -393,50 +400,51 @@ printk("adding rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
                        entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
                        memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
                        entry->local_ring = 0;
-                       trh->saddr[0]|=TR_RII; /* put the routing indicator back for tcpdump */
                }
                else
                {
                        entry->local_ring = 1;
                }
-       }       
+       }
        else    /* Y. Tahara added */
-       { 
+       {
                /*
                 *      Update existing entries
                 */
-               if (!entry->local_ring) 
+               if (!entry->local_ring)
                    if (entry->rcf != (trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK)) &&
                         !(trh->rcf & htons(TR_RCF_BROADCAST_MASK)))
                    {
 #if TR_SR_DEBUG
-printk("updating rif_entry: addr:%02X:%02X:%02X:%02X:%02X:%02X rcf:%04X\n",
-               trh->saddr[0],trh->saddr[1],trh->saddr[2],
-               trh->saddr[3],trh->saddr[4],trh->saddr[5],
-               ntohs(trh->rcf));
+{
+DECLARE_MAC_BUF(mac);
+printk("updating rif_entry: addr:%s rcf:%04X\n",
+               print_mac(mac, trh->saddr), ntohs(trh->rcf));
+}
 #endif
                            entry->rcf = trh->rcf & htons((unsigned short)~TR_RCF_BROADCAST_MASK);
-                           memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
-                   }                                         
-               entry->last_used=jiffies;               
+                           memcpy(&(entry->rseg[0]),&(trh->rseg[0]),8*sizeof(unsigned short));
+                   }
+               entry->last_used=jiffies;
        }
-       spin_unlock_bh(&rif_lock);
+       trh->saddr[0]=saddr0; /* put the routing indicator back for tcpdump */
+       spin_unlock_irqrestore(&rif_lock, flags);
 }
 
 /*
  *     Scan the cache with a timer and see what we need to throw out.
  */
 
-static void rif_check_expire(unsigned long dummy) 
+static void rif_check_expire(unsigned long dummy)
 {
        int i;
-       unsigned long next_interval = jiffies + sysctl_tr_rif_timeout/2;
+       unsigned long flags, next_interval = jiffies + sysctl_tr_rif_timeout/2;
+
+       spin_lock_irqsave(&rif_lock, flags);
 
-       spin_lock_bh(&rif_lock);
-       
        for(i =0; i < RIF_TABLE_SIZE; i++) {
                struct rif_cache *entry, **pentry;
-               
+
                pentry = rif_table+i;
                while((entry=*pentry) != NULL) {
                        unsigned long expires
@@ -453,8 +461,8 @@ static void rif_check_expire(unsigned long dummy)
                        }
                }
        }
-       
-       spin_unlock_bh(&rif_lock);
+
+       spin_unlock_irqrestore(&rif_lock, flags);
 
        mod_timer(&rif_timer, next_interval);
 
@@ -464,7 +472,7 @@ static void rif_check_expire(unsigned long dummy)
  *     Generate the /proc/net information for the token ring RIF
  *     routing.
  */
+
 #ifdef CONFIG_PROC_FS
 
 static struct rif_cache *rif_get_idx(loff_t pos)
@@ -473,7 +481,7 @@ static struct rif_cache *rif_get_idx(loff_t pos)
        struct rif_cache *entry;
        loff_t off = 0;
 
-       for(i = 0; i < RIF_TABLE_SIZE; i++) 
+       for(i = 0; i < RIF_TABLE_SIZE; i++)
                for(entry = rif_table[i]; entry; entry = entry->next) {
                        if (off == pos)
                                return entry;
@@ -485,7 +493,7 @@ static struct rif_cache *rif_get_idx(loff_t pos)
 
 static void *rif_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       spin_lock_bh(&rif_lock);
+       spin_lock_irq(&rif_lock);
 
        return *pos ? rif_get_idx(*pos - 1) : SEQ_START_TOKEN;
 }
@@ -502,7 +510,7 @@ static void *rif_seq_next(struct seq_file *seq, void *v, loff_t *pos)
                goto scan;
        }
 
-       if (ent->next) 
+       if (ent->next)
                return ent->next;
 
        i = rif_hash(ent->addr);
@@ -516,53 +524,54 @@ static void *rif_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 
 static void rif_seq_stop(struct seq_file *seq, void *v)
 {
-       spin_unlock_bh(&rif_lock);
+       spin_unlock_irq(&rif_lock);
 }
 
 static int rif_seq_show(struct seq_file *seq, void *v)
 {
        int j, rcf_len, segment, brdgnmb;
        struct rif_cache *entry = v;
+       DECLARE_MAC_BUF(mac);
 
        if (v == SEQ_START_TOKEN)
                seq_puts(seq,
                     "if     TR address       TTL   rcf   routing segments\n");
        else {
-               struct net_device *dev = dev_get_by_index(entry->iface);
+               struct net_device *dev = dev_get_by_index(&init_net, entry->iface);
                long ttl = (long) (entry->last_used + sysctl_tr_rif_timeout)
                                - (long) jiffies;
 
-               seq_printf(seq, "%s %02X:%02X:%02X:%02X:%02X:%02X %7li ",
+               seq_printf(seq, "%s %s %7li ",
                           dev?dev->name:"?",
-                          entry->addr[0],entry->addr[1],entry->addr[2],
-                          entry->addr[3],entry->addr[4],entry->addr[5],
+                          print_mac(mac, entry->addr),
                           ttl/HZ);
 
                        if (entry->local_ring)
-                               seq_puts(seq, "local\n");
+                               seq_puts(seq, "local\n");
                        else {
 
                                seq_printf(seq, "%04X", ntohs(entry->rcf));
-                               rcf_len = ((ntohs(entry->rcf) & TR_RCF_LEN_MASK)>>8)-2; 
+                               rcf_len = ((ntohs(entry->rcf) & TR_RCF_LEN_MASK)>>8)-2;
                                if (rcf_len)
-                                       rcf_len >>= 1;
+                                       rcf_len >>= 1;
                                for(j = 1; j < rcf_len; j++) {
                                        if(j==1) {
                                                segment=ntohs(entry->rseg[j-1])>>4;
                                                seq_printf(seq,"  %03X",segment);
-                                       };
+                                       }
+
                                        segment=ntohs(entry->rseg[j])>>4;
                                        brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
                                        seq_printf(seq,"-%01X-%03X",brdgnmb,segment);
                                }
                                seq_putc(seq, '\n');
                        }
-               }
+               }
        return 0;
 }
 
 
-static struct seq_operations rif_seq_ops = {
+static const struct seq_operations rif_seq_ops = {
        .start = rif_seq_start,
        .next  = rif_seq_next,
        .stop  = rif_seq_stop,
@@ -574,7 +583,7 @@ static int rif_seq_open(struct inode *inode, struct file *file)
        return seq_open(file, &rif_seq_ops);
 }
 
-static struct file_operations rif_seq_fops = {
+static const struct file_operations rif_seq_fops = {
        .owner   = THIS_MODULE,
        .open    = rif_seq_open,
        .read    = seq_read,
@@ -584,21 +593,25 @@ static struct file_operations rif_seq_fops = {
 
 #endif
 
+static const struct header_ops tr_header_ops = {
+       .create = tr_header,
+       .rebuild= tr_rebuild_header,
+};
+
 static void tr_setup(struct net_device *dev)
 {
        /*
         *      Configure and register
         */
-       
-       dev->hard_header        = tr_header;
-       dev->rebuild_header     = tr_rebuild_header;
+
+       dev->header_ops = &tr_header_ops;
 
        dev->type               = ARPHRD_IEEE802_TR;
        dev->hard_header_len    = TR_HLEN;
        dev->mtu                = 2000;
        dev->addr_len           = TR_ALEN;
        dev->tx_queue_len       = 100;  /* Long queues on tr */
-       
+
        memset(dev->broadcast,0xFF, TR_ALEN);
 
        /* New-style flags. */
@@ -628,18 +641,15 @@ struct net_device *alloc_trdev(int sizeof_priv)
 
 static int __init rif_init(void)
 {
-       init_timer(&rif_timer);
-       rif_timer.expires  = sysctl_tr_rif_timeout;
-       rif_timer.data     = 0L;
-       rif_timer.function = rif_check_expire;
+       rif_timer.expires  = jiffies + sysctl_tr_rif_timeout;
+       setup_timer(&rif_timer, rif_check_expire, 0);
        add_timer(&rif_timer);
 
-       proc_net_fops_create("tr_rif", S_IRUGO, &rif_seq_fops);
+       proc_net_fops_create(&init_net, "tr_rif", S_IRUGO, &rif_seq_fops);
        return 0;
 }
 
 module_init(rif_init);
 
-EXPORT_SYMBOL(tr_source_route);
 EXPORT_SYMBOL(tr_type_trans);
 EXPORT_SYMBOL(alloc_trdev);