netdev
[Top] [All Lists]

PATCH 2.4.4.3: remove dev_init_buffers users

To: Linus Torvalds <torvalds@xxxxxxxxxxxxx>, "David S. Miller" <davem@xxxxxxxxxx>
Subject: PATCH 2.4.4.3: remove dev_init_buffers users
From: Jeff Garzik <jgarzik@xxxxxxxxxxxxxxxx>
Date: Sun, 15 Apr 2001 03:02:48 -0400
Cc: kuznet@xxxxxxxxxxxxx, netdev@xxxxxxxxxxx, mike_phillips@xxxxxxxxxxx
Organization: MandrakeSoft
Sender: owner-netdev@xxxxxxxxxxx
Mike Phillips was kind enough to look into the history of
dev_init_buffers:

> It turned up in 2.1.20, when it used to call skb_queue_head_init
> (&dev->buffs[i]) and then was changed to DO NOTHING in 2.1.68.

So, this patch removes all users, and marks the function as going away
in 2.5.

-- 
Jeff Garzik       | "Give a man a fish, and he eats for a day. Teach a
Building 1024     |  man to fish, and a US Navy submarine will make sure
MandrakeSoft      |  he's never hungry again." -- Chris Neufeld
diff -urN linux.vanilla/drivers/char/synclink.c 
linux.buffers/drivers/char/synclink.c
--- linux.vanilla/drivers/char/synclink.c       Tue Mar  6 22:44:34 2001
+++ linux.buffers/drivers/char/synclink.c       Sun Apr 15 02:54:16 2001
@@ -7344,8 +7344,6 @@
        d->tx_timeout = mgsl_sppp_tx_timeout;
        d->watchdog_timeo = 10*HZ;
 
-       dev_init_buffers(d);
-
        if (register_netdev(d) == -1) {
                printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
                sppp_detach(info->netdev);
diff -urN linux.vanilla/drivers/net/arcnet/arcnet.c 
linux.buffers/drivers/net/arcnet/arcnet.c
--- linux.vanilla/drivers/net/arcnet/arcnet.c   Sat Mar  3 13:55:48 2001
+++ linux.buffers/drivers/net/arcnet/arcnet.c   Sun Apr 15 02:54:07 2001
@@ -361,8 +361,6 @@
        dev->get_stats = arcnet_get_stats;
        dev->hard_header = arcnet_header;
        dev->rebuild_header = arcnet_rebuild_header;
-
-       dev_init_buffers(dev);
 }
 
 
diff -urN linux.vanilla/drivers/net/eql.c linux.buffers/drivers/net/eql.c
--- linux.vanilla/drivers/net/eql.c     Tue Mar 20 15:05:01 2001
+++ linux.buffers/drivers/net/eql.c     Sun Apr 15 02:52:25 2001
@@ -240,8 +240,6 @@
         *      eql-generic values. 
         */
 
-       dev_init_buffers(dev);
-       
        /*
         *      Now we undo some of the things that eth_setup does
         *      that we don't like 
diff -urN linux.vanilla/drivers/net/hamradio/6pack.c 
linux.buffers/drivers/net/hamradio/6pack.c
--- linux.vanilla/drivers/net/hamradio/6pack.c  Thu Feb  8 19:32:44 2001
+++ linux.buffers/drivers/net/hamradio/6pack.c  Sun Apr 15 02:53:48 2001
@@ -798,8 +798,6 @@
        memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);      /* Only 
activated in AX.25 mode */
        memcpy(dev->dev_addr, ax25_test, AX25_ADDR_LEN);        /*    ""      
""       ""    "" */
 
-       dev_init_buffers(dev);
-
        /* New-style flags. */
        dev->flags              = 0;
 
diff -urN linux.vanilla/drivers/net/hamradio/baycom_epp.c 
linux.buffers/drivers/net/hamradio/baycom_epp.c
--- linux.vanilla/drivers/net/hamradio/baycom_epp.c     Mon Dec 11 16:23:31 2000
+++ linux.buffers/drivers/net/hamradio/baycom_epp.c     Sun Apr 15 02:53:54 2001
@@ -1379,8 +1379,6 @@
        dev->get_stats = baycom_get_stats;
 
        /* Fill in the fields of the device structure */
-       dev_init_buffers(dev);
-
        bc->skb = NULL;
        
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
diff -urN linux.vanilla/drivers/net/hamradio/bpqether.c 
linux.buffers/drivers/net/hamradio/bpqether.c
--- linux.vanilla/drivers/net/hamradio/bpqether.c       Fri Dec 29 17:35:47 2000
+++ linux.buffers/drivers/net/hamradio/bpqether.c       Sun Apr 15 02:53:32 2001
@@ -530,8 +530,6 @@
                 return -EIO;
         }
 
-       dev_init_buffers(dev);
-
        dev->hard_start_xmit = bpq_xmit;
        dev->open            = bpq_open;
        dev->stop            = bpq_close;
diff -urN linux.vanilla/drivers/net/hamradio/dmascc.c 
linux.buffers/drivers/net/hamradio/dmascc.c
--- linux.vanilla/drivers/net/hamradio/dmascc.c Tue Jul 18 19:52:35 2000
+++ linux.buffers/drivers/net/hamradio/dmascc.c Sun Apr 15 02:53:51 2001
@@ -593,7 +593,6 @@
     dev->tx_queue_len = 64;
     memcpy(dev->broadcast, ax25_broadcast, 7);
     memcpy(dev->dev_addr, ax25_test, 7);
-    dev_init_buffers(dev);
     rtnl_lock();
     if (register_netdevice(dev)) {
       printk("dmascc: could not register %s\n", dev->name);
diff -urN linux.vanilla/drivers/net/hamradio/hdlcdrv.c 
linux.buffers/drivers/net/hamradio/hdlcdrv.c
--- linux.vanilla/drivers/net/hamradio/hdlcdrv.c        Tue Feb 13 16:15:05 2001
+++ linux.buffers/drivers/net/hamradio/hdlcdrv.c        Sun Apr 15 02:53:35 2001
@@ -791,7 +791,6 @@
        dev->get_stats = hdlcdrv_get_stats;
 
        /* Fill in the fields of the device structure */
-       dev_init_buffers(dev);
 
        s->skb = NULL;
        
diff -urN linux.vanilla/drivers/net/hamradio/mkiss.c 
linux.buffers/drivers/net/hamradio/mkiss.c
--- linux.vanilla/drivers/net/hamradio/mkiss.c  Mon Jan 22 16:32:10 2001
+++ linux.buffers/drivers/net/hamradio/mkiss.c  Sun Apr 15 02:53:42 2001
@@ -935,8 +935,6 @@
        memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);
        memcpy(dev->dev_addr,  ax25_test,  AX25_ADDR_LEN);
 
-       dev_init_buffers(dev);
-
        /* New-style flags. */
        dev->flags      = 0;
 
diff -urN linux.vanilla/drivers/net/hamradio/scc.c 
linux.buffers/drivers/net/hamradio/scc.c
--- linux.vanilla/drivers/net/hamradio/scc.c    Tue Mar 20 15:05:00 2001
+++ linux.buffers/drivers/net/hamradio/scc.c    Sun Apr 15 02:53:45 2001
@@ -1574,8 +1574,6 @@
 
 static int scc_net_init(struct net_device *dev)
 {
-       dev_init_buffers(dev);
-       
        dev->tx_queue_len    = 16;      /* should be enough... */
 
        dev->open            = scc_net_open;
diff -urN linux.vanilla/drivers/net/hamradio/yam.c 
linux.buffers/drivers/net/hamradio/yam.c
--- linux.vanilla/drivers/net/hamradio/yam.c    Tue Feb 13 16:15:05 2001
+++ linux.buffers/drivers/net/hamradio/yam.c    Sun Apr 15 02:53:58 2001
@@ -1071,7 +1071,6 @@
        dev->hard_start_xmit = yam_send_packet;
        dev->get_stats = yam_get_stats;
 
-       dev_init_buffers(dev);
        skb_queue_head_init(&yp->send_queue);
 
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
diff -urN linux.vanilla/drivers/net/loopback.c 
linux.buffers/drivers/net/loopback.c
--- linux.vanilla/drivers/net/loopback.c        Sun Apr 15 02:37:17 2001
+++ linux.buffers/drivers/net/loopback.c        Sun Apr 15 02:52:19 2001
@@ -127,7 +127,5 @@
         *      Fill in the generic fields of the device structure. 
         */
    
-       dev_init_buffers(dev);
-  
        return(0);
 };
diff -urN linux.vanilla/drivers/net/net_init.c 
linux.buffers/drivers/net/net_init.c
--- linux.vanilla/drivers/net/net_init.c        Sun Apr 15 02:37:17 2001
+++ linux.buffers/drivers/net/net_init.c        Sun Apr 15 02:52:14 2001
@@ -174,8 +174,6 @@
 #if defined(CONFIG_HIPPI) || defined(CONFIG_TR) || defined(CONFIG_NET_FC)
 static int __register_netdev(struct net_device *dev)
 {
-       dev_init_buffers(dev);
-       
        if (dev->init && dev->init(dev) != 0) {
                unregister_netdev(dev);
                return -EIO;
@@ -418,8 +416,6 @@
 
        /* New-style flags. */
        dev->flags              = IFF_BROADCAST|IFF_MULTICAST;
-
-       dev_init_buffers(dev);
 }
 EXPORT_SYMBOL(ether_setup);
 
@@ -446,10 +442,6 @@
 
        /* New-style flags */
        dev->flags              = IFF_BROADCAST | IFF_MULTICAST;
-
-       dev_init_buffers(dev);
-       
-       return;
 }
 EXPORT_SYMBOL(fddi_setup);
 
@@ -486,8 +478,6 @@
         * static ARP tables. ARP is disabled by hippi_neigh_setup_dev. 
         */
        dev->flags = 0; 
-
-       dev_init_buffers(dev);
 }
 EXPORT_SYMBOL(hippi_setup);
 #endif /* CONFIG_HIPPI */
@@ -525,8 +515,6 @@
        dev->broadcast[0]       = 0xFF;
 
        dev->flags              = IFF_BROADCAST|IFF_MULTICAST|IFF_NOARP;
-
-       dev_init_buffers(dev);
 }
 EXPORT_SYMBOL(ltalk_setup);
 
@@ -676,7 +664,6 @@
 
         /* New-style flags. */
         dev->flags              =        IFF_BROADCAST;
-       dev_init_buffers(dev);
 }
 
 /**
diff -urN linux.vanilla/drivers/net/ppp_generic.c 
linux.buffers/drivers/net/ppp_generic.c
--- linux.vanilla/drivers/net/ppp_generic.c     Sun Feb  4 13:05:30 2001
+++ linux.buffers/drivers/net/ppp_generic.c     Sun Apr 15 02:54:04 2001
@@ -848,8 +848,6 @@
        dev->tx_queue_len = 3;
        dev->type = ARPHRD_PPP;
        dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
-
-       dev_init_buffers(dev);
        return 0;
 }
 
diff -urN linux.vanilla/drivers/net/shaper.c linux.buffers/drivers/net/shaper.c
--- linux.vanilla/drivers/net/shaper.c  Tue Feb 13 16:15:05 2001
+++ linux.buffers/drivers/net/shaper.c  Sun Apr 15 02:54:00 2001
@@ -651,8 +651,6 @@
         *      Intialise the packet queues
         */
         
-       dev_init_buffers(dev);
-       
        /*
         *      Handlers for when we attach to a device.
         */
diff -urN linux.vanilla/drivers/net/slip.c linux.buffers/drivers/net/slip.c
--- linux.vanilla/drivers/net/slip.c    Tue Feb 13 16:15:05 2001
+++ linux.buffers/drivers/net/slip.c    Sun Apr 15 02:51:51 2001
@@ -648,8 +648,6 @@
 
        SET_MODULE_OWNER(dev);
 
-       dev_init_buffers(dev);
-
        /* New-style flags. */
        dev->flags              = IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST;
 
diff -urN linux.vanilla/drivers/net/tun.c linux.buffers/drivers/net/tun.c
--- linux.vanilla/drivers/net/tun.c     Tue Feb 13 16:15:05 2001
+++ linux.buffers/drivers/net/tun.c     Sun Apr 15 02:54:13 2001
@@ -147,8 +147,6 @@
                dev->type = ARPHRD_PPP; 
                dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
                dev->tx_queue_len = 10;
-
-               dev_init_buffers(dev);
                break;
 
        case TUN_TAP_DEV:
diff -urN linux.vanilla/drivers/net/wan/cycx_x25.c 
linux.buffers/drivers/net/wan/cycx_x25.c
--- linux.vanilla/drivers/net/wan/cycx_x25.c    Tue Mar 20 15:05:01 2001
+++ linux.buffers/drivers/net/wan/cycx_x25.c    Sun Apr 15 02:52:29 2001
@@ -492,7 +492,6 @@
         dev->tx_queue_len = 10;
 
        /* Initialize socket buffers */
-       dev_init_buffers(dev);
        set_chan_state(dev, WAN_DISCONNECTED);
 
        return 0;
diff -urN linux.vanilla/drivers/net/wan/dlci.c 
linux.buffers/drivers/net/wan/dlci.c
--- linux.vanilla/drivers/net/wan/dlci.c        Sat Mar  3 13:55:48 2001
+++ linux.buffers/drivers/net/wan/dlci.c        Sun Apr 15 02:52:33 2001
@@ -575,8 +575,6 @@
        dev->addr_len           = sizeof(short);
        memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
 
-       dev_init_buffers(dev);
-       
        return(0);
 }
 
diff -urN linux.vanilla/drivers/net/wan/hdlc.c 
linux.buffers/drivers/net/wan/hdlc.c
--- linux.vanilla/drivers/net/wan/hdlc.c        Tue Mar  6 22:44:36 2001
+++ linux.buffers/drivers/net/wan/hdlc.c        Sun Apr 15 02:53:25 2001
@@ -1292,8 +1292,6 @@
                pvc->netdev.tx_queue_len = 0;
                pvc->netdev.flags = IFF_POINTOPOINT;
 
-               dev_init_buffers(&pvc->netdev);
-
                pvc->master = hdlc;
                *(u16*)pvc->netdev.dev_addr = htons(dlci);
                dlci_to_q922(pvc->netdev.broadcast, dlci);
@@ -1393,7 +1391,6 @@
 
        dev->flags = IFF_POINTOPOINT | IFF_NOARP;
 
-       dev_init_buffers(dev);
        return 0;
 }
 
@@ -1423,7 +1420,6 @@
        if (result != 0)
                return -EIO;
 
-       dev_init_buffers(dev);
        MOD_INC_USE_COUNT;
        return 0;
 }
diff -urN linux.vanilla/drivers/net/wan/hostess_sv11.c 
linux.buffers/drivers/net/wan/hostess_sv11.c
--- linux.vanilla/drivers/net/wan/hostess_sv11.c        Tue Mar  6 22:44:36 2001
+++ linux.buffers/drivers/net/wan/hostess_sv11.c        Sun Apr 15 02:52:40 2001
@@ -347,7 +347,6 @@
                d->do_ioctl = hostess_ioctl;
 #ifdef LINUX_21                        
                d->neigh_setup = hostess_neigh_setup_dev;
-               dev_init_buffers(d);
 #else
                d->init = return_0;
 #endif
diff -urN linux.vanilla/drivers/net/wan/lapbether.c 
linux.buffers/drivers/net/wan/lapbether.c
--- linux.vanilla/drivers/net/wan/lapbether.c   Mon Jan 22 16:32:10 2001
+++ linux.buffers/drivers/net/wan/lapbether.c   Sun Apr 15 02:52:42 2001
@@ -400,8 +400,6 @@
                 return -EIO;
         }
 
-       dev_init_buffers(dev);
-
        dev->hard_start_xmit = lapbeth_xmit;
        dev->open            = lapbeth_open;
        dev->stop            = lapbeth_close;
diff -urN linux.vanilla/drivers/net/wan/sdla.c 
linux.buffers/drivers/net/wan/sdla.c
--- linux.vanilla/drivers/net/wan/sdla.c        Tue Feb 13 16:15:05 2001
+++ linux.buffers/drivers/net/wan/sdla.c        Sun Apr 15 02:52:45 2001
@@ -1641,8 +1641,6 @@
        dev->addr_len           = 0;
        dev->mtu                = SDLA_MAX_MTU;
 
-       dev_init_buffers(dev);
-   
        flp->activate           = sdla_activate;
        flp->deactivate         = sdla_deactivate;
        flp->assoc              = sdla_assoc;
diff -urN linux.vanilla/drivers/net/wan/sdla_chdlc.c 
linux.buffers/drivers/net/wan/sdla_chdlc.c
--- linux.vanilla/drivers/net/wan/sdla_chdlc.c  Sun Apr 15 02:37:19 2001
+++ linux.buffers/drivers/net/wan/sdla_chdlc.c  Sun Apr 15 02:53:13 2001
@@ -1025,7 +1025,6 @@
    
        /* Initialize socket buffers */
       #if defined(LINUX_2_1) || defined(LINUX_2_4)
-       dev_init_buffers(dev);
       #else
         for (i = 0; i < DEV_NUMBUFFS; ++i)
                 skb_queue_head_init(&dev->buffs[i]);
diff -urN linux.vanilla/drivers/net/wan/sdla_fr.c 
linux.buffers/drivers/net/wan/sdla_fr.c
--- linux.vanilla/drivers/net/wan/sdla_fr.c     Sun Apr 15 02:37:19 2001
+++ linux.buffers/drivers/net/wan/sdla_fr.c     Sun Apr 15 02:52:55 2001
@@ -1276,7 +1276,6 @@
 
                        /* Initialize socket buffers */
              #if defined(LINUX_2_1) || defined(LINUX_2_4)
-               dev_init_buffers(dev);
              #else
                for (i = 0; i < DEV_NUMBUFFS; ++i)
                        skb_queue_head_init(&dev->buffs[i]);
diff -urN linux.vanilla/drivers/net/wan/sdla_ppp.c 
linux.buffers/drivers/net/wan/sdla_ppp.c
--- linux.vanilla/drivers/net/wan/sdla_ppp.c    Sun Apr 15 02:37:19 2001
+++ linux.buffers/drivers/net/wan/sdla_ppp.c    Sun Apr 15 02:52:58 2001
@@ -789,7 +789,6 @@
    
        /* Initialize socket buffers */
       #if defined(LINUX_2_1) || defined(LINUX_2_4)
-       dev_init_buffers(dev);
       #else
         for (i = 0; i < DEV_NUMBUFFS; ++i)
                 skb_queue_head_init(&dev->buffs[i]);
diff -urN linux.vanilla/drivers/net/wan/sdla_x25.c 
linux.buffers/drivers/net/wan/sdla_x25.c
--- linux.vanilla/drivers/net/wan/sdla_x25.c    Sun Apr 15 02:37:19 2001
+++ linux.buffers/drivers/net/wan/sdla_x25.c    Sun Apr 15 02:53:01 2001
@@ -1169,7 +1169,6 @@
 
        /* Initialize socket buffers */
       #if defined(LINUX_2_1) || defined(LINUX_2_4)
-       dev_init_buffers(dev);  
       #else
         for (i = 0; i < DEV_NUMBUFFS; ++i)
                 skb_queue_head_init(&dev->buffs[i]);
diff -urN linux.vanilla/drivers/net/wan/sealevel.c 
linux.buffers/drivers/net/wan/sealevel.c
--- linux.vanilla/drivers/net/wan/sealevel.c    Tue Mar  6 22:44:37 2001
+++ linux.buffers/drivers/net/wan/sealevel.c    Sun Apr 15 02:53:05 2001
@@ -375,7 +375,6 @@
                        d->do_ioctl = sealevel_ioctl;
 #ifdef LINUX_21                        
                        d->neigh_setup = sealevel_neigh_setup_dev;
-                       dev_init_buffers(d);
 #else
                        d->init = return_0;
 #endif
diff -urN linux.vanilla/drivers/net/wan/syncppp.c 
linux.buffers/drivers/net/wan/syncppp.c
--- linux.vanilla/drivers/net/wan/syncppp.c     Tue Mar  6 22:44:37 2001
+++ linux.buffers/drivers/net/wan/syncppp.c     Sun Apr 15 02:53:08 2001
@@ -1048,7 +1048,6 @@
        dev->hard_header_cache = NULL;
        dev->header_cache_update = NULL;
        dev->flags = IFF_MULTICAST|IFF_POINTOPOINT|IFF_NOARP;
-       dev_init_buffers(dev);
 }
 
 EXPORT_SYMBOL(sppp_attach);
diff -urN linux.vanilla/drivers/net/wan/wanpipe_multppp.c 
linux.buffers/drivers/net/wan/wanpipe_multppp.c
--- linux.vanilla/drivers/net/wan/wanpipe_multppp.c     Sun Apr 15 02:37:20 2001
+++ linux.buffers/drivers/net/wan/wanpipe_multppp.c     Sun Apr 15 02:53:29 2001
@@ -720,7 +720,6 @@
    
        /* Initialize socket buffers */
       #if defined(LINUX_2_1) || defined(LINUX_2_4)
-       dev_init_buffers(dev);
       #else
         for (i = 0; i < DEV_NUMBUFFS; ++i)
                 skb_queue_head_init(&dev->buffs[i]);
diff -urN linux.vanilla/drivers/net/wan/x25_asy.c 
linux.buffers/drivers/net/wan/x25_asy.c
--- linux.vanilla/drivers/net/wan/x25_asy.c     Sat Nov 11 22:02:39 2000
+++ linux.buffers/drivers/net/wan/x25_asy.c     Sun Apr 15 02:53:10 2001
@@ -874,8 +874,6 @@
        dev->type               = ARPHRD_X25;
        dev->tx_queue_len       = 10;
 
-       dev_init_buffers(dev);
-       
        /* New-style flags. */
        dev->flags              = IFF_NOARP;
 
diff -urN linux.vanilla/drivers/s390/net/ctcmain.c 
linux.buffers/drivers/s390/net/ctcmain.c
--- linux.vanilla/drivers/s390/net/ctcmain.c    Sun Apr 15 02:37:22 2001
+++ linux.buffers/drivers/s390/net/ctcmain.c    Sun Apr 15 02:54:19 2001
@@ -3252,7 +3252,6 @@
        dev->type                = ARPHRD_SLIP;
        dev->tx_queue_len        = 100;
        SET_DEVICE_START(dev, 1);
-       dev_init_buffers(dev);
        dev->flags               = IFF_POINTOPOINT | IFF_NOARP;
        for (direction = READ; direction <= WRITE; direction++) {
                if ((ctc_no_auto == 0) || (devno[direction] == -1))
diff -urN linux.vanilla/drivers/s390/net/netiucv.c 
linux.buffers/drivers/s390/net/netiucv.c
--- linux.vanilla/drivers/s390/net/netiucv.c    Sun Apr 15 02:37:22 2001
+++ linux.buffers/drivers/s390/net/netiucv.c    Sun Apr 15 02:54:29 2001
@@ -707,7 +707,6 @@
        dev->flags = IFF_NOARP | IFF_POINTOPOINT;
        dev->mtu = 9216;
 
-       dev_init_buffers (dev);
        pr_debug ("%s: iucv_init  dev@=%p\n", dev->name, dev);
        return 0;
 }
diff -urN linux.vanilla/include/linux/netdevice.h 
linux.buffers/include/linux/netdevice.h
--- linux.vanilla/include/linux/netdevice.h     Sun Apr 15 02:37:42 2001
+++ linux.buffers/include/linux/netdevice.h     Sun Apr 15 02:51:19 2001
@@ -565,7 +565,7 @@
 
 static inline void dev_init_buffers(struct net_device *dev)
 {
-       /* DO NOTHING */
+       /* WILL BE REMOVED IN 2.5.0 */
 }
 
 extern int netdev_finish_unregister(struct net_device *dev);
diff -urN linux.vanilla/net/atm/clip.c linux.buffers/net/atm/clip.c
--- linux.vanilla/net/atm/clip.c        Fri Jul  7 00:37:24 2000
+++ linux.buffers/net/atm/clip.c        Sun Apr 15 02:51:48 2001
@@ -571,7 +571,6 @@
            /* compromise between decent burst-tolerance and protection */
            /* against memory hogs. */
        dev->flags = 0;
-       dev_init_buffers(dev); /* is this ever supposed to be used ? */
        return 0;
 }
 
diff -urN linux.vanilla/net/ipv4/ip_gre.c linux.buffers/net/ipv4/ip_gre.c
--- linux.vanilla/net/ipv4/ip_gre.c     Sun Apr 15 02:37:47 2001
+++ linux.buffers/net/ipv4/ip_gre.c     Sun Apr 15 02:51:31 2001
@@ -1147,8 +1147,6 @@
        dev->do_ioctl           = ipgre_tunnel_ioctl;
        dev->change_mtu         = ipgre_tunnel_change_mtu;
 
-       dev_init_buffers(dev);
-
        dev->type               = ARPHRD_IPGRE;
        dev->hard_header_len    = LL_MAX_HEADER + sizeof(struct iphdr) + 4;
        dev->mtu                = 1500 - sizeof(struct iphdr) - 4;
diff -urN linux.vanilla/net/ipv4/ipip.c linux.buffers/net/ipv4/ipip.c
--- linux.vanilla/net/ipv4/ipip.c       Sun Apr 15 02:37:47 2001
+++ linux.buffers/net/ipv4/ipip.c       Sun Apr 15 02:51:29 2001
@@ -794,8 +794,6 @@
        dev->do_ioctl           = ipip_tunnel_ioctl;
        dev->change_mtu         = ipip_tunnel_change_mtu;
 
-       dev_init_buffers(dev);
-
        dev->type               = ARPHRD_TUNNEL;
        dev->hard_header_len    = LL_MAX_HEADER + sizeof(struct iphdr);
        dev->mtu                = 1500 - sizeof(struct iphdr);
diff -urN linux.vanilla/net/ipv6/sit.c linux.buffers/net/ipv6/sit.c
--- linux.vanilla/net/ipv6/sit.c        Sun Apr 15 02:37:49 2001
+++ linux.buffers/net/ipv6/sit.c        Sun Apr 15 02:51:37 2001
@@ -747,8 +747,6 @@
        dev->do_ioctl           = ipip6_tunnel_ioctl;
        dev->change_mtu         = ipip6_tunnel_change_mtu;
 
-       dev_init_buffers(dev);
-
        dev->type               = ARPHRD_SIT;
        dev->hard_header_len    = LL_MAX_HEADER + sizeof(struct iphdr);
        dev->mtu                = 1500 - sizeof(struct iphdr);
diff -urN linux.vanilla/net/irda/irda_device.c 
linux.buffers/net/irda/irda_device.c
--- linux.vanilla/net/irda/irda_device.c        Wed Nov 29 00:53:45 2000
+++ linux.buffers/net/irda/irda_device.c        Sun Apr 15 02:51:44 2001
@@ -430,7 +430,6 @@
        memset(dev->broadcast, 0xff, 4);
 
        dev->mtu = 2048;
-       dev_init_buffers(dev);
        dev->flags = IFF_NOARP;
        return 0;
 }
diff -urN linux.vanilla/net/netrom/nr_dev.c linux.buffers/net/netrom/nr_dev.c
--- linux.vanilla/net/netrom/nr_dev.c   Fri Dec 29 17:35:47 2000
+++ linux.buffers/net/netrom/nr_dev.c   Sun Apr 15 02:51:35 2001
@@ -231,7 +231,5 @@
 
        dev->get_stats = nr_get_stats;
 
-       dev_init_buffers(dev);
-
        return 0;
 };
diff -urN linux.vanilla/net/rose/rose_dev.c linux.buffers/net/rose/rose_dev.c
--- linux.vanilla/net/rose/rose_dev.c   Fri Dec 29 17:35:47 2000
+++ linux.buffers/net/rose/rose_dev.c   Sun Apr 15 02:51:41 2001
@@ -200,7 +200,5 @@
 
        dev->get_stats = rose_get_stats;
 
-       dev_init_buffers(dev);
-
        return 0;
 };
<Prev in Thread] Current Thread [Next in Thread>
  • PATCH 2.4.4.3: remove dev_init_buffers users, Jeff Garzik <=