Commit 51558576 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:
  tcp: Revert 'process defer accept as established' changes.
  ipv6: Fix duplicate initialization of rawv6_prot.destroy
  bnx2x: Updating the Maintainer
  net: Eliminate flush_scheduled_work() calls while RTNL is held.
  drivers/net/r6040.c: correct bad use of round_jiffies()
  fec_mpc52xx: MPC52xx_MESSAGES_DEFAULT: 2nd NETIF_MSG_IFDOWN => IFUP
  ipg: fix receivemode IPG_RM_RECEIVEMULTICAST{,HASH} in ipg_nic_set_multicast_list()
  netfilter: nf_conntrack: fix ctnetlink related crash in nf_nat_setup_info()
  netfilter: Make nflog quiet when no one listen in userspace.
  ipv6: Fail with appropriate error code when setting not-applicable sockopt.
  ipv6: Check IPV6_MULTICAST_LOOP option value.
  ipv6: Check the hop limit setting in ancillary data.
  ipv6 route: Fix route lifetime in netlink message.
  ipv6 mcast: Check address family of gf_group in getsockopt(MS_FILTER).
  dccp: Bug in initial acknowledgment number assignment
  dccp ccid-3: X truncated due to type conversion
  dccp ccid-3: TFRC reverse-lookup Bug-Fix
  dccp ccid-2: Bug-Fix - Ack Vectors need to be ignored on request sockets
  dccp: Fix sparse warnings
  dccp ccid-3: Bug-Fix - Zero RTT is possible
parents d36e3110 ec0a1966

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -995,8 +995,8 @@ L: netdev@vger.kernel.org 
S:	Supported



BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

P:	Eliezer Tamir

M:	eliezert@broadcom.com

P:	Eilon Greenstein

M:	eilong@broadcom.com

L:	netdev@vger.kernel.org

S:	Supported

drivers/net/bnx2.c

+1 −8
Original line number Diff line number Diff line
@@ -5724,14 +5724,12 @@ bnx2_reset_task(struct work_struct *work) 
	if (!netif_running(bp->dev))

		return;



	bp->in_reset_task = 1;

	bnx2_netif_stop(bp);



	bnx2_init_nic(bp);



	atomic_set(&bp->intr_sem, 1);

	bnx2_netif_start(bp);

	bp->in_reset_task = 0;

}



static void
@@ -5907,12 +5905,7 @@ bnx2_close(struct net_device *dev) 
	struct bnx2 *bp = netdev_priv(dev);

	u32 reset_code;



	/* Calling flush_scheduled_work() may deadlock because

	 * linkwatch_event() may be on the workqueue and it will try to get

	 * the rtnl_lock which we are holding.

	 */

	while (bp->in_reset_task)

		msleep(1);

	cancel_work_sync(&bp->reset_task);



	bnx2_disable_int_sync(bp);

	bnx2_napi_disable(bp);

drivers/net/bnx2.h

+0 −1
Original line number Diff line number Diff line
@@ -6656,7 +6656,6 @@ struct bnx2 { 
	int			current_interval;

	struct			timer_list timer;

	struct work_struct	reset_task;

	int			in_reset_task;



	/* Used to synchronize phy accesses. */

	spinlock_t		phy_lock;

drivers/net/bnx2x.c

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation.

 *

 * Written by: Eliezer Tamir <eliezert@broadcom.com>

 * Maintained by: Eilon Greenstein <eilong@broadcom.com>

 * Written by: Eliezer Tamir

 * Based on code from Michael Chan's bnx2 driver

 * UDP CSUM errata workaround by Arik Gendelman

 * Slowpath rework by Vladislav Zolotarov
@@ -74,7 +75,7 @@ static char version[] __devinitdata = 
	"Broadcom NetXtreme II 5771X 10Gigabit Ethernet Driver "

	DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";



MODULE_AUTHOR("Eliezer Tamir <eliezert@broadcom.com>");

MODULE_AUTHOR("Eliezer Tamir");

MODULE_DESCRIPTION("Broadcom NetXtreme II BCM57710 Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRV_MODULE_VERSION);

drivers/net/bnx2x.h

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ 
 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation.

 *

 * Written by: Eliezer Tamir <eliezert@broadcom.com>

 * Maintained by: Eilon Greenstein <eilong@broadcom.com>

 * Written by: Eliezer Tamir

 * Based on code from Michael Chan's bnx2 driver

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE