1 files changed, 102 insertions, 125 deletions

diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index 9978afbd9f2a..b0ceac2d6cd1 100644
--- a/net/phonet/pep-gprs.c
+++ b/net/phonet/pep-gprs.c
@@ -40,23 +40,17 @@ struct gprs_dev {
         void                    (*old_data_ready)(struct sock *, int);
         void                    (*old_write_space)(struct sock *);
 
-        struct net_device       *net;
-        struct net_device_stats stats;
-
-        struct sk_buff_head     tx_queue;
-        struct work_struct      tx_work;
-        spinlock_t              tx_lock;
-        unsigned                tx_max;
+        struct net_device       *dev;
 };
 
-static int gprs_type_trans(struct sk_buff *skb)
+static __be16 gprs_type_trans(struct sk_buff *skb)
 {
         const u8 *pvfc;
         u8 buf;
 
         pvfc = skb_header_pointer(skb, 0, 1, &buf);
         if (!pvfc)
-                return 0;
+                return htons(0);
         /* Look at IP version field */
         switch (*pvfc >> 4) {
         case 4:
@@ -64,7 +58,15 @@ static int gprs_type_trans(struct sk_buff *skb)
         case 6:
                 return htons(ETH_P_IPV6);
         }
-        return 0;
+        return htons(0);
+}
+
+static void gprs_writeable(struct gprs_dev *gp)
+{
+        struct net_device *dev = gp->dev;
+
+        if (pep_writeable(gp->sk))
+                netif_wake_queue(dev);
 }
 
 /*
@@ -73,18 +75,21 @@ static int gprs_type_trans(struct sk_buff *skb)
 
 static void gprs_state_change(struct sock *sk)
 {
-        struct gprs_dev *dev = sk->sk_user_data;
+        struct gprs_dev *gp = sk->sk_user_data;
 
         if (sk->sk_state == TCP_CLOSE_WAIT) {
-                netif_stop_queue(dev->net);
-                netif_carrier_off(dev->net);
+                struct net_device *dev = gp->dev;
+
+                netif_stop_queue(dev);
+                netif_carrier_off(dev);
         }
 }
 
-static int gprs_recv(struct gprs_dev *dev, struct sk_buff *skb)
+static int gprs_recv(struct gprs_dev *gp, struct sk_buff *skb)
 {
+        struct net_device *dev = gp->dev;
         int err = 0;
-        u16 protocol = gprs_type_trans(skb);
+        __be16 protocol = gprs_type_trans(skb);
 
         if (!protocol) {
                 err = -EINVAL;
@@ -99,7 +104,7 @@ static int gprs_recv(struct gprs_dev *dev, struct sk_buff *skb)
                  * so wrap the IP packet as a single fragment of an head-less
                  * socket buffer. The network stack will pull what it needs,
                  * but at least, the whole IP payload is not memcpy'd. */
-                rskb = netdev_alloc_skb(dev->net, 0);
+                rskb = netdev_alloc_skb(dev, 0);
                 if (!rskb) {
                         err = -ENOBUFS;
                         goto drop;
@@ -123,9 +128,9 @@ static int gprs_recv(struct gprs_dev *dev, struct sk_buff *skb)
 
         skb->protocol = protocol;
         skb_reset_mac_header(skb);
-        skb->dev = dev->net;
+        skb->dev = dev;
 
-        if (likely(dev->net->flags & IFF_UP)) {
+        if (likely(dev->flags & IFF_UP)) {
                 dev->stats.rx_packets++;
                 dev->stats.rx_bytes += skb->len;
                 netif_rx(skb);
@@ -143,34 +148,46 @@ drop:
 
 static void gprs_data_ready(struct sock *sk, int len)
 {
-        struct gprs_dev *dev = sk->sk_user_data;
+        struct gprs_dev *gp = sk->sk_user_data;
         struct sk_buff *skb;
 
         while ((skb = pep_read(sk)) != NULL) {
                 skb_orphan(skb);
-                gprs_recv(dev, skb);
+                gprs_recv(gp, skb);
         }
 }
 
 static void gprs_write_space(struct sock *sk)
 {
-        struct gprs_dev *dev = sk->sk_user_data;
-        unsigned credits = pep_writeable(sk);
-
-        spin_lock_bh(&dev->tx_lock);
-        dev->tx_max = credits;
-        if (credits > skb_queue_len(&dev->tx_queue))
-                netif_wake_queue(dev->net);
-        spin_unlock_bh(&dev->tx_lock);
+        struct gprs_dev *gp = sk->sk_user_data;
+
+        if (netif_running(gp->dev))
+                gprs_writeable(gp);
 }
 
 /*
  * Network device callbacks
  */
 
-static int gprs_xmit(struct sk_buff *skb, struct net_device *net)
+static int gprs_open(struct net_device *dev)
 {
-        struct gprs_dev *dev = netdev_priv(net);
+        struct gprs_dev *gp = netdev_priv(dev);
+
+        gprs_writeable(gp);
+        return 0;
+}
+
+static int gprs_close(struct net_device *dev)
+{
+        netif_stop_queue(dev);
+        return 0;
+}
+
+static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+        struct gprs_dev *gp = netdev_priv(dev);
+        struct sock *sk = gp->sk;
+        int len, err;
 
         switch (skb->protocol) {
         case  htons(ETH_P_IP):
@@ -181,82 +198,50 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *net)
                 return 0;
         }
 
-        spin_lock(&dev->tx_lock);
-        if (likely(skb_queue_len(&dev->tx_queue) < dev->tx_max)) {
-                skb_queue_tail(&dev->tx_queue, skb);
-                skb = NULL;
-        }
-        if (skb_queue_len(&dev->tx_queue) >= dev->tx_max)
-                netif_stop_queue(net);
-        spin_unlock(&dev->tx_lock);
-
-        schedule_work(&dev->tx_work);
-        if (unlikely(skb))
+        skb_orphan(skb);
+        skb_set_owner_w(skb, sk);
+        len = skb->len;
+        err = pep_write(sk, skb);
+        if (err) {
+                LIMIT_NETDEBUG(KERN_WARNING"%s: TX error (%d)\n",
+                                dev->name, err);
+                dev->stats.tx_aborted_errors++;
+                dev->stats.tx_errors++;
                 dev_kfree_skb(skb);
-        return 0;
-}
-
-static void gprs_tx(struct work_struct *work)
-{
-        struct gprs_dev *dev = container_of(work, struct gprs_dev, tx_work);
-        struct sock *sk = dev->sk;
-        struct sk_buff *skb;
-
-        while ((skb = skb_dequeue(&dev->tx_queue)) != NULL) {
-                int err;
-
-                dev->stats.tx_bytes += skb->len;
+        } else {
                 dev->stats.tx_packets++;
-
-                skb_orphan(skb);
-                skb_set_owner_w(skb, sk);
-
-                lock_sock(sk);
-                err = pep_write(sk, skb);
-                if (err) {
-                        LIMIT_NETDEBUG(KERN_WARNING"%s: TX error (%d)\n",
-                                        dev->net->name, err);
-                        dev->stats.tx_aborted_errors++;
-                        dev->stats.tx_errors++;
-                }
-                release_sock(sk);
+                dev->stats.tx_bytes += len;
         }
 
-        lock_sock(sk);
-        gprs_write_space(sk);
-        release_sock(sk);
+        if (!pep_writeable(sk))
+                netif_stop_queue(dev);
+        return 0;
 }
 
-static int gprs_set_mtu(struct net_device *net, int new_mtu)
+static int gprs_set_mtu(struct net_device *dev, int new_mtu)
 {
         if ((new_mtu < 576) || (new_mtu > (PHONET_MAX_MTU - 11)))
                 return -EINVAL;
 
-        net->mtu = new_mtu;
+        dev->mtu = new_mtu;
         return 0;
 }
 
-static struct net_device_stats *gprs_get_stats(struct net_device *net)
-{
-        struct gprs_dev *dev = netdev_priv(net);
-
-        return &dev->stats;
-}
-
-static void gprs_setup(struct net_device *net)
+static void gprs_setup(struct net_device *dev)
 {
-        net->features           = NETIF_F_FRAGLIST;
-        net->type               = ARPHRD_NONE;
-        net->flags              = IFF_POINTOPOINT | IFF_NOARP;
-        net->mtu                = GPRS_DEFAULT_MTU;
-        net->hard_header_len    = 0;
-        net->addr_len           = 0;
-        net->tx_queue_len       = 10;
-
-        net->destructor         = free_netdev;
-        net->hard_start_xmit    = gprs_xmit; /* mandatory */
-        net->change_mtu         = gprs_set_mtu;
-        net->get_stats          = gprs_get_stats;
+        dev->features           = NETIF_F_FRAGLIST;
+        dev->type               = ARPHRD_PHONET_PIPE;
+        dev->flags              = IFF_POINTOPOINT | IFF_NOARP;
+        dev->mtu                = GPRS_DEFAULT_MTU;
+        dev->hard_header_len    = 0;
+        dev->addr_len           = 0;
+        dev->tx_queue_len       = 10;
+
+        dev->destructor         = free_netdev;
+        dev->open               = gprs_open;
+        dev->stop               = gprs_close;
+        dev->hard_start_xmit    = gprs_xmit; /* mandatory */
+        dev->change_mtu         = gprs_set_mtu;
 }
 
 /*
@@ -270,28 +255,25 @@ static void gprs_setup(struct net_device *net)
 int gprs_attach(struct sock *sk)
 {
         static const char ifname[] = "gprs%d";
-        struct gprs_dev *dev;
-        struct net_device *net;
+        struct gprs_dev *gp;
+        struct net_device *dev;
         int err;
 
         if (unlikely(sk->sk_type == SOCK_STREAM))
                 return -EINVAL; /* need packet boundaries */
 
         /* Create net device */
-        net = alloc_netdev(sizeof(*dev), ifname, gprs_setup);
-        if (!net)
+        dev = alloc_netdev(sizeof(*gp), ifname, gprs_setup);
+        if (!dev)
                 return -ENOMEM;
-        dev = netdev_priv(net);
-        dev->net = net;
-        dev->tx_max = 0;
-        spin_lock_init(&dev->tx_lock);
-        skb_queue_head_init(&dev->tx_queue);
-        INIT_WORK(&dev->tx_work, gprs_tx);
-
-        netif_stop_queue(net);
-        err = register_netdev(net);
+        gp = netdev_priv(dev);
+        gp->sk = sk;
+        gp->dev = dev;
+
+        netif_stop_queue(dev);
+        err = register_netdev(dev);
         if (err) {
-                free_netdev(net);
+                free_netdev(dev);
                 return err;
         }
 
@@ -305,43 +287,38 @@ int gprs_attach(struct sock *sk)
                 err = -EINVAL;
                 goto out_rel;
         }
-        sk->sk_user_data        = dev;
-        dev->old_state_change   = sk->sk_state_change;
-        dev->old_data_ready     = sk->sk_data_ready;
-        dev->old_write_space    = sk->sk_write_space;
+        sk->sk_user_data        = gp;
+        gp->old_state_change    = sk->sk_state_change;
+        gp->old_data_ready      = sk->sk_data_ready;
+        gp->old_write_space     = sk->sk_write_space;
         sk->sk_state_change     = gprs_state_change;
         sk->sk_data_ready       = gprs_data_ready;
         sk->sk_write_space      = gprs_write_space;
         release_sock(sk);
-
         sock_hold(sk);
-        dev->sk = sk;
 
-        printk(KERN_DEBUG"%s: attached\n", net->name);
-        gprs_write_space(sk); /* kick off TX */
-        return net->ifindex;
+        printk(KERN_DEBUG"%s: attached\n", dev->name);
+        return dev->ifindex;
 
 out_rel:
         release_sock(sk);
-        unregister_netdev(net);
+        unregister_netdev(dev);
         return err;
 }
 
 void gprs_detach(struct sock *sk)
 {
-        struct gprs_dev *dev = sk->sk_user_data;
-        struct net_device *net = dev->net;
+        struct gprs_dev *gp = sk->sk_user_data;
+        struct net_device *dev = gp->dev;
 
         lock_sock(sk);
         sk->sk_user_data        = NULL;
-        sk->sk_state_change     = dev->old_state_change;
-        sk->sk_data_ready       = dev->old_data_ready;
-        sk->sk_write_space      = dev->old_write_space;
+        sk->sk_state_change     = gp->old_state_change;
+        sk->sk_data_ready       = gp->old_data_ready;
+        sk->sk_write_space      = gp->old_write_space;
         release_sock(sk);
 
-        printk(KERN_DEBUG"%s: detached\n", net->name);
-        unregister_netdev(net);
-        flush_scheduled_work();
+        printk(KERN_DEBUG"%s: detached\n", dev->name);
+        unregister_netdev(dev);
         sock_put(sk);
-        skb_queue_purge(&dev->tx_queue);
 }