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

Commit d5a92dd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [PKT_SCHED] netem: Orphan SKB when adding to queue.
  [NET]: kernel-doc fix for sock.h
  [NET]: Reduce sizeof(struct flowi) by 20 bytes.
  [IPv6] fib: initialize tb6_lock in common place to give lockdep a key
  [ATM] nicstar: Fix a bogus casting warning
  [ATM] firestream: handle thrown error
  [ATM]: No need to return void
  [ATM]: handle sysfs errors
  [DCCP] ipv6: Fix opt_skb leak.
  [DCCP]: Fix Oops in DCCPv6
parents d0b72a08 4e8a5201

drivers/atm/ambassador.c

+2 −2
Original line number Diff line number Diff line
@@ -2453,7 +2453,7 @@ static void __exit amb_module_exit (void) 
{

  PRINTD (DBG_FLOW|DBG_INIT, "cleanup_module");



  return pci_unregister_driver(&amb_driver);

  pci_unregister_driver(&amb_driver);

}



module_init(amb_module_init);

drivers/atm/firestream.c

+4 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,10 @@ static int fs_open(struct atm_vcc *atm_vcc) 
					r = ROUND_UP;

				}

				error = make_rate (pcr, r, &tmc0, NULL);

				if (error) {

					kfree(tc);

					return error;

				}

			}

			fs_dprintk (FS_DEBUG_OPEN, "pcr = %d.\n", pcr);

		}

drivers/atm/horizon.c

+2 −2
Original line number Diff line number Diff line
@@ -2933,7 +2933,7 @@ static int __init hrz_module_init (void) { 
static void __exit hrz_module_exit (void) {

  PRINTD (DBG_FLOW, "cleanup_module");



  return pci_unregister_driver(&hrz_driver);

  pci_unregister_driver(&hrz_driver);

}



module_init(hrz_module_init);

drivers/atm/nicstar.c

+2 −2
Original line number Diff line number Diff line
@@ -2759,7 +2759,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
{

   ns_dev *card;

   pool_levels pl;

   int btype;

   long btype;

   unsigned long flags;



   card = dev->dev_data;
@@ -2859,7 +2859,7 @@ static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg) 
      case NS_ADJBUFLEV:

         if (!capable(CAP_NET_ADMIN))

	    return -EPERM;

         btype = (int) arg;	/* an int is the same size as a pointer */

         btype = (long) arg;	/* a long is the same size as a pointer or bigger */

         switch (btype)

	 {

	    case NS_BUFTYPE_SMALL:

drivers/pci/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1 
 * is marked here since the boot video device will be the only enabled

 * video device at this point.

 */



#if 0

static void __devinit fixup_video(struct pci_dev *pdev)

{

	struct pci_dev *bridge;
@@ -1663,7 +1663,7 @@ static void __devinit fixup_video(struct pci_dev *pdev) 
	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video);



#endif



static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)

{