hostap_cs: add ID for Conceptronic CON11CPro

[linux-2.6-omap-h63xx.git] / drivers / net / loopback.c

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 662b8d16803ce7fec85f59af645b60aabee75c41..41b774baac4d4ce6651b51f051ecc9b003d5a623 100644 (file)
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -64,8 +64,6 @@ struct pcpu_lstats {
        unsigned long bytes;
 };
 
-#define LOOPBACK_OVERHEAD (128 + MAX_HEADER + 16 + 16)
-
 /* KISS: just allocate small chunks and copy bits.
  *
  * So, in fact, this is documentation, explaining what we expect
@@ -242,7 +240,7 @@ static void loopback_setup(struct net_device *dev)
                | NETIF_F_NO_CSUM
                | NETIF_F_HIGHDMA
                | NETIF_F_LLTX
-               | NETIF_F_NETNS_LOCAL,
+               | NETIF_F_NETNS_LOCAL;
        dev->ethtool_ops        = &loopback_ethtool_ops;
        dev->header_ops         = &eth_header_ops;
        dev->init = loopback_dev_init;
@@ -260,7 +258,7 @@ static __net_init int loopback_net_init(struct net *net)
        if (!dev)
                goto out;
 
-       dev->nd_net = net;
+       dev_net_set(dev, net);
        err = register_netdev(dev);
        if (err)
                goto out_free_netdev;