Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8728b834 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller
Browse files

[NET]: Kill skb->list 



Remove the "list" member of struct sk_buff, as it is entirely
redundant.  All SKB list removal callers know which list the
SKB is on, so storing this in sk_buff does nothing other than
taking up some space.

Two tricky bits were SCTP, which I took care of, and two ATM
drivers which Francois Romieu <romieu@fr.zoreil.com> fixed
up.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent 6869c4d8

drivers/atm/nicstar.c

+74 −83
Original line number Diff line number Diff line
@@ -214,8 +214,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev); 
static void __devinit ns_init_card_error(ns_dev *card, int error);

static scq_info *get_scq(int size, u32 scd);

static void free_scq(scq_info *scq, struct atm_vcc *vcc);

static void push_rxbufs(ns_dev *card, u32 type, u32 handle1, u32 addr1,

                       u32 handle2, u32 addr2);

static void push_rxbufs(ns_dev *, struct sk_buff *);

static irqreturn_t ns_irq_handler(int irq, void *dev_id, struct pt_regs *regs);

static int ns_open(struct atm_vcc *vcc);

static void ns_close(struct atm_vcc *vcc);
@@ -766,6 +765,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 
         ns_init_card_error(card, error);

	 return error;

      }

      NS_SKB_CB(hb)->buf_type = BUF_NONE;

      skb_queue_tail(&card->hbpool.queue, hb);

      card->hbpool.count++;

   }
@@ -786,9 +786,10 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 
         ns_init_card_error(card, error);

	 return error;

      }

      NS_SKB_CB(lb)->buf_type = BUF_LG;

      skb_queue_tail(&card->lbpool.queue, lb);

      skb_reserve(lb, NS_SMBUFSIZE);

      push_rxbufs(card, BUF_LG, (u32) lb, (u32) virt_to_bus(lb->data), 0, 0);

      push_rxbufs(card, lb);

      /* Due to the implementation of push_rxbufs() this is 1, not 0 */

      if (j == 1)

      {
@@ -822,9 +823,10 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 
         ns_init_card_error(card, error);

	 return error;

      }

      NS_SKB_CB(sb)->buf_type = BUF_SM;

      skb_queue_tail(&card->sbpool.queue, sb);

      skb_reserve(sb, NS_AAL0_HEADER);

      push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data), 0, 0);

      push_rxbufs(card, sb);

   }

   /* Test for strange behaviour which leads to crashes */

   if ((bcount = ns_stat_sfbqc_get(readl(card->membase + STAT))) < card->sbnr.min)
@@ -852,6 +854,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 
         ns_init_card_error(card, error);

	 return error;

      }

      NS_SKB_CB(iovb)->buf_type = BUF_NONE;

      skb_queue_tail(&card->iovpool.queue, iovb);

      card->iovpool.count++;

   }
@@ -1078,12 +1081,18 @@ static void free_scq(scq_info *scq, struct atm_vcc *vcc) 


/* The handles passed must be pointers to the sk_buff containing the small

   or large buffer(s) cast to u32. */

static void push_rxbufs(ns_dev *card, u32 type, u32 handle1, u32 addr1,

                       u32 handle2, u32 addr2)

static void push_rxbufs(ns_dev *card, struct sk_buff *skb)

{

   struct ns_skb_cb *cb = NS_SKB_CB(skb);

   u32 handle1, addr1;

   u32 handle2, addr2;

   u32 stat;

   unsigned long flags;

   

   /* *BARF* */

   handle2 = addr2 = 0;

   handle1 = (u32)skb;

   addr1 = (u32)virt_to_bus(skb->data);



#ifdef GENERAL_DEBUG

   if (!addr1)
@@ -1093,7 +1102,7 @@ static void push_rxbufs(ns_dev *card, u32 type, u32 handle1, u32 addr1, 
   stat = readl(card->membase + STAT);

   card->sbfqc = ns_stat_sfbqc_get(stat);

   card->lbfqc = ns_stat_lfbqc_get(stat);

   if (type == BUF_SM)

   if (cb->buf_type == BUF_SM)

   {

      if (!addr2)

      {
@@ -1111,7 +1120,7 @@ static void push_rxbufs(ns_dev *card, u32 type, u32 handle1, u32 addr1, 
	 }

      }      

   }

   else /* type == BUF_LG */

   else /* buf_type == BUF_LG */

   {

      if (!addr2)

      {
@@ -1132,26 +1141,26 @@ static void push_rxbufs(ns_dev *card, u32 type, u32 handle1, u32 addr1, 


   if (addr2)

   {

      if (type == BUF_SM)

      if (cb->buf_type == BUF_SM)

      {

         if (card->sbfqc >= card->sbnr.max)

         {

            skb_unlink((struct sk_buff *) handle1);

            skb_unlink((struct sk_buff *) handle1, &card->sbpool.queue);

            dev_kfree_skb_any((struct sk_buff *) handle1);

            skb_unlink((struct sk_buff *) handle2);

            skb_unlink((struct sk_buff *) handle2, &card->sbpool.queue);

            dev_kfree_skb_any((struct sk_buff *) handle2);

            return;

         }

	 else

            card->sbfqc += 2;

      }

      else /* (type == BUF_LG) */

      else /* (buf_type == BUF_LG) */

      {

         if (card->lbfqc >= card->lbnr.max)

         {

            skb_unlink((struct sk_buff *) handle1);

            skb_unlink((struct sk_buff *) handle1, &card->lbpool.queue);

            dev_kfree_skb_any((struct sk_buff *) handle1);

            skb_unlink((struct sk_buff *) handle2);

            skb_unlink((struct sk_buff *) handle2, &card->lbpool.queue);

            dev_kfree_skb_any((struct sk_buff *) handle2);

            return;

         }
@@ -1166,12 +1175,12 @@ static void push_rxbufs(ns_dev *card, u32 type, u32 handle1, u32 addr1, 
      writel(handle2, card->membase + DR2);

      writel(addr1, card->membase + DR1);

      writel(handle1, card->membase + DR0);

      writel(NS_CMD_WRITE_FREEBUFQ | (u32) type, card->membase + CMD);

      writel(NS_CMD_WRITE_FREEBUFQ | cb->buf_type, card->membase + CMD);

 

      spin_unlock_irqrestore(&card->res_lock, flags);



      XPRINTK("nicstar%d: Pushing %s buffers at 0x%x and 0x%x.\n", card->index,

              (type == BUF_SM ? "small" : "large"), addr1, addr2);

              (cb->buf_type == BUF_SM ? "small" : "large"), addr1, addr2);

   }



   if (!card->efbie && card->sbfqc >= card->sbnr.min &&
@@ -1322,9 +1331,10 @@ static irqreturn_t ns_irq_handler(int irq, void *dev_id, struct pt_regs *regs) 
            card->efbie = 0;

            break;

         }

         NS_SKB_CB(sb)->buf_type = BUF_SM;

         skb_queue_tail(&card->sbpool.queue, sb);

         skb_reserve(sb, NS_AAL0_HEADER);

         push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data), 0, 0);

         push_rxbufs(card, sb);

      }

      card->sbfqc = i;

      process_rsq(card);
@@ -1348,9 +1358,10 @@ static irqreturn_t ns_irq_handler(int irq, void *dev_id, struct pt_regs *regs) 
            card->efbie = 0;

            break;

         }

         NS_SKB_CB(lb)->buf_type = BUF_LG;

         skb_queue_tail(&card->lbpool.queue, lb);

         skb_reserve(lb, NS_SMBUFSIZE);

         push_rxbufs(card, BUF_LG, (u32) lb, (u32) virt_to_bus(lb->data), 0, 0);

         push_rxbufs(card, lb);

      }

      card->lbfqc = i;

      process_rsq(card);
@@ -2227,6 +2238,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
            recycle_rx_buf(card, skb);

            return;

	 }

         NS_SKB_CB(iovb)->buf_type = BUF_NONE;

      }

      else

         if (--card->iovpool.count < card->iovnr.min)
@@ -2234,6 +2246,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
	    struct sk_buff *new_iovb;

	    if ((new_iovb = alloc_skb(NS_IOVBUFSIZE, GFP_ATOMIC)) != NULL)

	    {

               NS_SKB_CB(iovb)->buf_type = BUF_NONE;

               skb_queue_tail(&card->iovpool.queue, new_iovb);

               card->iovpool.count++;

	    }
@@ -2264,7 +2277,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 


   if (NS_SKB(iovb)->iovcnt == 1)

   {

      if (skb->list != &card->sbpool.queue)

      if (NS_SKB_CB(skb)->buf_type != BUF_SM)

      {

         printk("nicstar%d: Expected a small buffer, and this is not one.\n",

	        card->index);
@@ -2278,7 +2291,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
   }

   else /* NS_SKB(iovb)->iovcnt >= 2 */

   {

      if (skb->list != &card->lbpool.queue)

      if (NS_SKB_CB(skb)->buf_type != BUF_LG)

      {

         printk("nicstar%d: Expected a large buffer, and this is not one.\n",

	        card->index);
@@ -2322,8 +2335,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
         /* skb points to a small buffer */

         if (!atm_charge(vcc, skb->truesize))

         {

            push_rxbufs(card, BUF_SM, (u32) skb, (u32) virt_to_bus(skb->data),

                        0, 0);

            push_rxbufs(card, skb);

            atomic_inc(&vcc->stats->rx_drop);

         }

         else
@@ -2350,8 +2362,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
	 {

            if (!atm_charge(vcc, sb->truesize))

            {

               push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data),

                           0, 0);

               push_rxbufs(card, sb);

               atomic_inc(&vcc->stats->rx_drop);

            }

            else
@@ -2367,16 +2378,14 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
               atomic_inc(&vcc->stats->rx);

            }



            push_rxbufs(card, BUF_LG, (u32) skb,

	                   (u32) virt_to_bus(skb->data), 0, 0);

            push_rxbufs(card, skb);



	 }

	 else			/* len > NS_SMBUFSIZE, the usual case */

	 {

            if (!atm_charge(vcc, skb->truesize))

            {

               push_rxbufs(card, BUF_LG, (u32) skb,

                           (u32) virt_to_bus(skb->data), 0, 0);

               push_rxbufs(card, skb);

               atomic_inc(&vcc->stats->rx_drop);

            }

            else
@@ -2394,8 +2403,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
               atomic_inc(&vcc->stats->rx);

            }



            push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data),

                        0, 0);

            push_rxbufs(card, sb);



         }
@@ -2430,6 +2438,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
                  card->hbpool.count++;

               }

            }

            NS_SKB_CB(hb)->buf_type = BUF_NONE;

	 }

	 else

         if (--card->hbpool.count < card->hbnr.min)
@@ -2437,6 +2446,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
            struct sk_buff *new_hb;

            if ((new_hb = dev_alloc_skb(NS_HBUFSIZE)) != NULL)

            {

               NS_SKB_CB(new_hb)->buf_type = BUF_NONE;

               skb_queue_tail(&card->hbpool.queue, new_hb);

               card->hbpool.count++;

            }
@@ -2444,6 +2454,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
	    {

               if ((new_hb = dev_alloc_skb(NS_HBUFSIZE)) != NULL)

               {

                  NS_SKB_CB(new_hb)->buf_type = BUF_NONE;

                  skb_queue_tail(&card->hbpool.queue, new_hb);

                  card->hbpool.count++;

               }
@@ -2473,8 +2484,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
            remaining = len - iov->iov_len;

            iov++;

            /* Free the small buffer */

            push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data),

                        0, 0);

            push_rxbufs(card, sb);



            /* Copy all large buffers to the huge buffer and free them */

            for (j = 1; j < NS_SKB(iovb)->iovcnt; j++)
@@ -2485,8 +2495,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe) 
               skb_put(hb, tocopy);

               iov++;

               remaining -= tocopy;

               push_rxbufs(card, BUF_LG, (u32) lb,

                           (u32) virt_to_bus(lb->data), 0, 0);

               push_rxbufs(card, lb);

            }

#ifdef EXTRA_DEBUG

            if (remaining != 0 || hb->len != len)
@@ -2527,9 +2536,10 @@ static void ns_sb_destructor(struct sk_buff *sb) 
      sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);

      if (sb == NULL)

         break;

      NS_SKB_CB(sb)->buf_type = BUF_SM;

      skb_queue_tail(&card->sbpool.queue, sb);

      skb_reserve(sb, NS_AAL0_HEADER);

      push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data), 0, 0);

      push_rxbufs(card, sb);

   } while (card->sbfqc < card->sbnr.min);

}
@@ -2550,9 +2560,10 @@ static void ns_lb_destructor(struct sk_buff *lb) 
      lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);

      if (lb == NULL)

         break;

      NS_SKB_CB(lb)->buf_type = BUF_LG;

      skb_queue_tail(&card->lbpool.queue, lb);

      skb_reserve(lb, NS_SMBUFSIZE);

      push_rxbufs(card, BUF_LG, (u32) lb, (u32) virt_to_bus(lb->data), 0, 0);

      push_rxbufs(card, lb);

   } while (card->lbfqc < card->lbnr.min);

}
@@ -2569,6 +2580,7 @@ static void ns_hb_destructor(struct sk_buff *hb) 
      hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);

      if (hb == NULL)

         break;

      NS_SKB_CB(hb)->buf_type = BUF_NONE;

      skb_queue_tail(&card->hbpool.queue, hb);

      card->hbpool.count++;

   }
@@ -2577,43 +2589,23 @@ static void ns_hb_destructor(struct sk_buff *hb) 
#endif /* NS_USE_DESTRUCTORS */







static void recycle_rx_buf(ns_dev *card, struct sk_buff *skb)

{

   if (skb->list == &card->sbpool.queue)

      push_rxbufs(card, BUF_SM, (u32) skb, (u32) virt_to_bus(skb->data), 0, 0);

   else if (skb->list == &card->lbpool.queue)

      push_rxbufs(card, BUF_LG, (u32) skb, (u32) virt_to_bus(skb->data), 0, 0);

   else

   {

	struct ns_skb_cb *cb = NS_SKB_CB(skb);



	if (unlikely(cb->buf_type == BUF_NONE)) {

		printk("nicstar%d: What kind of rx buffer is this?\n", card->index);

		dev_kfree_skb_any(skb);

   }

	} else

		push_rxbufs(card, skb);

}







static void recycle_iovec_rx_bufs(ns_dev *card, struct iovec *iov, int count)

{

   struct sk_buff *skb;



   for (; count > 0; count--)

   {

      skb = (struct sk_buff *) (iov++)->iov_base;

      if (skb->list == &card->sbpool.queue)

         push_rxbufs(card, BUF_SM, (u32) skb, (u32) virt_to_bus(skb->data),

	             0, 0);

      else if (skb->list == &card->lbpool.queue)

         push_rxbufs(card, BUF_LG, (u32) skb, (u32) virt_to_bus(skb->data),

	             0, 0);

      else

      {

         printk("nicstar%d: What kind of rx buffer is this?\n", card->index);

         dev_kfree_skb_any(skb);

      }

	while (count-- > 0)

		recycle_rx_buf(card, (struct sk_buff *) (iov++)->iov_base);

}

}







static void recycle_iov_buf(ns_dev *card, struct sk_buff *iovb)
@@ -2631,7 +2623,7 @@ static void recycle_iov_buf(ns_dev *card, struct sk_buff *iovb) 


static void dequeue_sm_buf(ns_dev *card, struct sk_buff *sb)

{

   skb_unlink(sb);

   skb_unlink(sb, &card->sbpool.queue);

#ifdef NS_USE_DESTRUCTORS

   if (card->sbfqc < card->sbnr.min)

#else
@@ -2640,10 +2632,10 @@ static void dequeue_sm_buf(ns_dev *card, struct sk_buff *sb) 
      struct sk_buff *new_sb;

      if ((new_sb = dev_alloc_skb(NS_SMSKBSIZE)) != NULL)

      {

         NS_SKB_CB(new_sb)->buf_type = BUF_SM;

         skb_queue_tail(&card->sbpool.queue, new_sb);

         skb_reserve(new_sb, NS_AAL0_HEADER);

         push_rxbufs(card, BUF_SM, (u32) new_sb,

                     (u32) virt_to_bus(new_sb->data), 0, 0);

         push_rxbufs(card, new_sb);

      }

   }

   if (card->sbfqc < card->sbnr.init)
@@ -2652,10 +2644,10 @@ static void dequeue_sm_buf(ns_dev *card, struct sk_buff *sb) 
      struct sk_buff *new_sb;

      if ((new_sb = dev_alloc_skb(NS_SMSKBSIZE)) != NULL)

      {

         NS_SKB_CB(new_sb)->buf_type = BUF_SM;

         skb_queue_tail(&card->sbpool.queue, new_sb);

         skb_reserve(new_sb, NS_AAL0_HEADER);

         push_rxbufs(card, BUF_SM, (u32) new_sb,

                     (u32) virt_to_bus(new_sb->data), 0, 0);

         push_rxbufs(card, new_sb);

      }

   }

}
@@ -2664,7 +2656,7 @@ static void dequeue_sm_buf(ns_dev *card, struct sk_buff *sb) 


static void dequeue_lg_buf(ns_dev *card, struct sk_buff *lb)

{

   skb_unlink(lb);

   skb_unlink(lb, &card->lbpool.queue);

#ifdef NS_USE_DESTRUCTORS

   if (card->lbfqc < card->lbnr.min)

#else
@@ -2673,10 +2665,10 @@ static void dequeue_lg_buf(ns_dev *card, struct sk_buff *lb) 
      struct sk_buff *new_lb;

      if ((new_lb = dev_alloc_skb(NS_LGSKBSIZE)) != NULL)

      {

         NS_SKB_CB(new_lb)->buf_type = BUF_LG;

         skb_queue_tail(&card->lbpool.queue, new_lb);

         skb_reserve(new_lb, NS_SMBUFSIZE);

         push_rxbufs(card, BUF_LG, (u32) new_lb,

                     (u32) virt_to_bus(new_lb->data), 0, 0);

         push_rxbufs(card, new_lb);

      }

   }

   if (card->lbfqc < card->lbnr.init)
@@ -2685,10 +2677,10 @@ static void dequeue_lg_buf(ns_dev *card, struct sk_buff *lb) 
      struct sk_buff *new_lb;

      if ((new_lb = dev_alloc_skb(NS_LGSKBSIZE)) != NULL)

      {

         NS_SKB_CB(new_lb)->buf_type = BUF_LG;

         skb_queue_tail(&card->lbpool.queue, new_lb);

         skb_reserve(new_lb, NS_SMBUFSIZE);

         push_rxbufs(card, BUF_LG, (u32) new_lb,

                     (u32) virt_to_bus(new_lb->data), 0, 0);

         push_rxbufs(card, new_lb);

      }

   }

}
@@ -2880,9 +2872,10 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
                  sb = __dev_alloc_skb(NS_SMSKBSIZE, GFP_KERNEL);

                  if (sb == NULL)

                     return -ENOMEM;

                  NS_SKB_CB(sb)->buf_type = BUF_SM;

                  skb_queue_tail(&card->sbpool.queue, sb);

                  skb_reserve(sb, NS_AAL0_HEADER);

                  push_rxbufs(card, BUF_SM, (u32) sb, (u32) virt_to_bus(sb->data), 0, 0);

                  push_rxbufs(card, sb);

	       }

	       break;
@@ -2894,9 +2887,10 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
                  lb = __dev_alloc_skb(NS_LGSKBSIZE, GFP_KERNEL);

                  if (lb == NULL)

                     return -ENOMEM;

                  NS_SKB_CB(lb)->buf_type = BUF_LG;

                  skb_queue_tail(&card->lbpool.queue, lb);

                  skb_reserve(lb, NS_SMBUFSIZE);

                  push_rxbufs(card, BUF_LG, (u32) lb, (u32) virt_to_bus(lb->data), 0, 0);

                  push_rxbufs(card, lb);

	       }

	       break;
@@ -2923,6 +2917,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
                  hb = __dev_alloc_skb(NS_HBUFSIZE, GFP_KERNEL);

                  if (hb == NULL)

                     return -ENOMEM;

                  NS_SKB_CB(hb)->buf_type = BUF_NONE;

                  ns_grab_int_lock(card, flags);

                  skb_queue_tail(&card->hbpool.queue, hb);

                  card->hbpool.count++;
@@ -2953,6 +2948,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
                  iovb = alloc_skb(NS_IOVBUFSIZE, GFP_KERNEL);

                  if (iovb == NULL)

                     return -ENOMEM;

                  NS_SKB_CB(iovb)->buf_type = BUF_NONE;

                  ns_grab_int_lock(card, flags);

                  skb_queue_tail(&card->iovpool.queue, iovb);

                  card->iovpool.count++;
@@ -2979,17 +2975,12 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
}







static void which_list(ns_dev *card, struct sk_buff *skb)

{

   printk("It's a %s buffer.\n", skb->list == &card->sbpool.queue ?

          "small" : skb->list == &card->lbpool.queue ? "large" :

	  skb->list == &card->hbpool.queue ? "huge" :

	  skb->list == &card->iovpool.queue ? "iovec" : "unknown");

	printk("skb buf_type: 0x%08x\n", NS_SKB_CB(skb)->buf_type);

}







static void ns_poll(unsigned long arg)

{

   int i;

drivers/atm/nicstar.h

+14 −2
Original line number Diff line number Diff line
@@ -103,8 +103,14 @@ 


#define NS_IOREMAP_SIZE 4096



/*

 * BUF_XX distinguish the Rx buffers depending on their (small/large) size.

 * BUG_SM and BUG_LG are both used by the driver and the device.

 * BUF_NONE is only used by the driver.

 */

#define BUF_SM		0x00000000	/* These two are used for push_rxbufs() */

#define BUF_LG		0x00000001	/* CMD, Write_FreeBufQ, LBUF bit */

#define BUF_NONE 	0xffffffff	/* Software only: */



#define NS_HBUFSIZE 65568	/* Size of max. AAL5 PDU */

#define NS_MAX_IOVECS (2 + (65568 - NS_SMBUFSIZE) / \
@@ -684,6 +690,12 @@ enum ns_regs 
/* Device driver structures ***************************************************/





struct ns_skb_cb {

	u32 buf_type;			/* BUF_SM/BUF_LG/BUF_NONE */

};



#define NS_SKB_CB(skb)	((struct ns_skb_cb *)((skb)->cb))



typedef struct tsq_info

{

   void *org;

drivers/atm/zatm.c

+5 −3
Original line number Diff line number Diff line
@@ -417,10 +417,12 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]); 
		chan = (here[3] & uPD98401_AAL5_CHAN) >>

		    uPD98401_AAL5_CHAN_SHIFT;

		if (chan < zatm_dev->chans && zatm_dev->rx_map[chan]) {

			int pos = ZATM_VCC(vcc)->pool;



			vcc = zatm_dev->rx_map[chan];

			if (skb == zatm_dev->last_free[ZATM_VCC(vcc)->pool])

				zatm_dev->last_free[ZATM_VCC(vcc)->pool] = NULL;

			skb_unlink(skb);

			if (skb == zatm_dev->last_free[pos])

				zatm_dev->last_free[pos] = NULL;

			skb_unlink(skb, zatm_dev->pool + pos);

		}

		else {

			printk(KERN_ERR DEV_LABEL "(itf %d): RX indication "

drivers/bluetooth/bfusb.c

+4 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int bfusb_send_bulk(struct bfusb *bfusb, struct sk_buff *skb) 
	if (err) {

		BT_ERR("%s bulk tx submit failed urb %p err %d", 

					bfusb->hdev->name, urb, err);

		skb_unlink(skb);

		skb_unlink(skb, &bfusb->pending_q);

		usb_free_urb(urb);

	} else

		atomic_inc(&bfusb->pending_tx);
@@ -212,7 +212,7 @@ static void bfusb_tx_complete(struct urb *urb, struct pt_regs *regs) 


	read_lock(&bfusb->lock);



	skb_unlink(skb);

	skb_unlink(skb, &bfusb->pending_q);

	skb_queue_tail(&bfusb->completed_q, skb);



	bfusb_tx_wakeup(bfusb);
@@ -253,7 +253,7 @@ static int bfusb_rx_submit(struct bfusb *bfusb, struct urb *urb) 
	if (err) {

		BT_ERR("%s bulk rx submit failed urb %p err %d",

					bfusb->hdev->name, urb, err);

		skb_unlink(skb);

		skb_unlink(skb, &bfusb->pending_q);

		kfree_skb(skb);

		usb_free_urb(urb);

	}
@@ -398,7 +398,7 @@ static void bfusb_rx_complete(struct urb *urb, struct pt_regs *regs) 
		buf   += len;

	}



	skb_unlink(skb);

	skb_unlink(skb, &bfusb->pending_q);

	kfree_skb(skb);



	bfusb_rx_submit(bfusb, urb);

drivers/ieee1394/ieee1394_core.c

+2 −2
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static void handle_packet_response(struct hpsb_host *host, int tcode, 
                return;

        }



	__skb_unlink(skb, skb->list);

	__skb_unlink(skb, &host->pending_packet_queue);



	if (packet->state == hpsb_queued) {

		packet->sendtime = jiffies;
@@ -989,7 +989,7 @@ void abort_timedouts(unsigned long __opaque) 
		packet = (struct hpsb_packet *)skb->data;



		if (time_before(packet->sendtime + expire, jiffies)) {

			__skb_unlink(skb, skb->list);

			__skb_unlink(skb, &host->pending_packet_queue);

			packet->state = hpsb_complete;

			packet->ack_code = ACKX_TIMEOUT;

			queue_packet_complete(packet);