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

Commit f290fc36 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:
  [ICMP]: ICMP_MIB_OUTMSGS increment duplicated
  [IPV6]: RFC 2011 compatibility broken
  [IPV6]: ICMP6_MIB_OUTMSGS increment duplicated
  [NET]: rtnl_link: fix use-after-free
  [AF_KEY]: Fix skb leak on pfkey_send_migrate() error
  [ATM] atm/suni.c: Fix section mismatch.
  [ATM] atm/idt77105.c: Fix section mismatch.
  [IrDA]: af_irda memory leak fixes
  [NEIGH]: Revert 'Fix race between neigh_parms_release and neightbl_fill_parms'
  [NETFILTER]: bridge-netfilter: fix net_device refcnt leaks
  [IPV6] ROUTE: Make sending algorithm more friendly with RFC 4861.
  [IPV4] FIB_HASH : Avoid unecessary loop in fn_hash_dump_zone()
  [NET]: Fix interrupt semaphore corruption in Intel drivers.
  [IPV4] fib_trie: fix duplicated route issue
  [IPV4] fib_hash: fix duplicated route issue
  [IPV6]: Mischecked tw match in __inet6_check_established.
  rfkill: call rfkill_led_trigger_unregister() on error
parents 240d3b54 5b4d383a

drivers/atm/idt77105.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -357,7 +357,7 @@ static const struct atmphy_ops idt77105_ops = { 
};

};









int __devinit idt77105_init(struct atm_dev *dev)

int idt77105_init(struct atm_dev *dev)

{

{

	dev->phy = &idt77105_ops;

	dev->phy = &idt77105_ops;

	return 0;

	return 0;

drivers/atm/suni.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ static const struct atmphy_ops suni_ops = { 
};

};









int __devinit suni_init(struct atm_dev *dev)

int suni_init(struct atm_dev *dev)

{

{

	unsigned char mri;

	unsigned char mri;

drivers/net/e1000/e1000_main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -632,6 +632,7 @@ e1000_down(struct e1000_adapter *adapter) 




#ifdef CONFIG_E1000_NAPI

#ifdef CONFIG_E1000_NAPI

	napi_disable(&adapter->napi);

	napi_disable(&adapter->napi);

	atomic_set(&adapter->irq_sem, 0);

#endif

#endif

	e1000_irq_disable(adapter);

	e1000_irq_disable(adapter);

drivers/net/e1000e/netdev.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2183,6 +2183,7 @@ void e1000e_down(struct e1000_adapter *adapter) 
	msleep(10);

	msleep(10);





	napi_disable(&adapter->napi);

	napi_disable(&adapter->napi);

	atomic_set(&adapter->irq_sem, 0);

	e1000_irq_disable(adapter);

	e1000_irq_disable(adapter);





	del_timer_sync(&adapter->watchdog_timer);

	del_timer_sync(&adapter->watchdog_timer);

drivers/net/ixgb/ixgb_main.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -296,6 +296,11 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog) 
{

{

	struct net_device *netdev = adapter->netdev;

	struct net_device *netdev = adapter->netdev;





#ifdef CONFIG_IXGB_NAPI

	napi_disable(&adapter->napi);

	atomic_set(&adapter->irq_sem, 0);

#endif



	ixgb_irq_disable(adapter);

	ixgb_irq_disable(adapter);

	free_irq(adapter->pdev->irq, netdev);

	free_irq(adapter->pdev->irq, netdev);
@@ -304,9 +309,7 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog) 




	if(kill_watchdog)

	if(kill_watchdog)

		del_timer_sync(&adapter->watchdog_timer);

		del_timer_sync(&adapter->watchdog_timer);

#ifdef CONFIG_IXGB_NAPI



	napi_disable(&adapter->napi);

#endif

	adapter->link_speed = 0;

	adapter->link_speed = 0;

	adapter->link_duplex = 0;

	adapter->link_duplex = 0;

	netif_carrier_off(netdev);

	netif_carrier_off(netdev);