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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (36 commits)
  [ATM]: Check IP header validity in mpc_send_packet
  [IPV6]: IPV6_MULTICAST_IF setting is ignored on link-local connect()
  [CONNECTOR]: Don't touch queue dev after decrement of ref count.
  [SOCK]: Adds a rcu_dereference() in sk_filter
  [XFRM]: xfrm_algo_clone() allocates too much memory
  [FORCEDETH]: Fix reversing the MAC address on suspend.
  [NET]: mcs7830 passes msecs instead of jiffies to usb_control_msg
  [LRO] Fix lro_mgr->features checks
  [NET]: Clone the sk_buff 'iif' field in __skb_clone()
  [IPV4] ROUTE: ip_rt_dump() is unecessary slow
  [NET]: kaweth was forgotten in msec switchover of usb_start_wait_urb
  [NET] Intel ethernet drivers: update MAINTAINERS
  [NET]: Make ->poll() breakout consistent in Intel ethernet drivers.
  [NET]: Stop polling when napi_disable() is pending.
  [NET]: Fix drivers to handle napi_disable() disabling interrupts.
  [NETXEN]: Fix ->poll() done logic.
  mac80211: return an error when SIWRATE doesn't match any rate
  ssb: Fix probing of PCI cores if PCI and PCIE core is available
  [NET]: Do not check netif_running() and carrier state in ->poll()
  [NET]: Add NAPI_STATE_DISABLE.
  ...
parents fcfd50af 1c9b7aa1

Documentation/nfsroot.txt

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> 
		this option.



                  off or none: don't use autoconfiguration

				(do static IP assignment instead)

		  on or any:   use any protocol available in the kernel

			       (default)

		  dhcp:        use DHCP

MAINTAINERS

+8 −10
Original line number Diff line number Diff line
@@ -1984,29 +1984,27 @@ L: netdev@vger.kernel.org 
S:	Maintained



INTEL PRO/100 ETHERNET SUPPORT

P:	John Ronciak

M:	john.ronciak@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	John Ronciak

M:	john.ronciak@intel.com

L:	e1000-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/e1000/

S:	Supported



INTEL PRO/1000 GIGABIT ETHERNET SUPPORT

P:	Jeb Cramer

M:	cramerj@intel.com

P:	John Ronciak

M:	john.ronciak@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	Jesse Brandeburg

M:	jesse.brandeburg@intel.com

P:	Jeff Kirsher

M:	jeffrey.t.kirsher@intel.com

P:	Auke Kok

M:	auke-jan.h.kok@intel.com

P:	John Ronciak

M:	john.ronciak@intel.com

L:	e1000-devel@lists.sourceforge.net

W:	http://sourceforge.net/projects/e1000/

S:	Supported

drivers/atm/nicstar.c

+9 −10
Original line number Diff line number Diff line
@@ -625,14 +625,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 
   if (mac[i] == NULL)

      nicstar_init_eprom(card->membase);



   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)

   {

      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);

      error = 9;

      ns_init_card_error(card, error);

      return error;

   }



   /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */

   writel(0x00000000, card->membase + VPM);
@@ -858,8 +850,6 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 
      card->iovpool.count++;

   }



   card->intcnt = 0;



   /* Configure NICStAR */

   if (card->rct_size == 4096)

      ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES;
@@ -868,6 +858,15 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) 


   card->efbie = 1;



   card->intcnt = 0;

   if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)

   {

      printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);

      error = 9;

      ns_init_card_error(card, error);

      return error;

   }



   /* Register device */

   card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);

   if (card->atmdev == NULL)

drivers/connector/cn_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id 
	spin_unlock_bh(&dev->queue_lock);



	if (found) {

		atomic_dec(&dev->refcnt);

		cn_queue_free_callback(cbq);

		atomic_dec(&dev->refcnt);

		return -EINVAL;

	}

drivers/net/e100.c

+3 −4
Original line number Diff line number Diff line
@@ -1991,13 +1991,12 @@ static int e100_poll(struct napi_struct *napi, int budget) 
	struct nic *nic = container_of(napi, struct nic, napi);

	struct net_device *netdev = nic->netdev;

	unsigned int work_done = 0;

	int tx_cleaned;



	e100_rx_clean(nic, &work_done, budget);

	tx_cleaned = e100_tx_clean(nic);

	e100_tx_clean(nic);



	/* If no Rx and Tx cleanup work was done, exit polling mode. */

	if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {

	/* If budget not fully consumed, exit the polling mode */

	if (work_done < budget) {

		netif_rx_complete(netdev, napi);

		e100_enable_irq(nic);

	}