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

Commit 07d952dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (54 commits)
  ipv6: check for IPv4 mapped addresses when connecting IPv6 sockets
  mlx4: decreasing ref count when removing mac
  net: Fix security_socket_sendmsg() bypass problem.
  net: Cap number of elements for sendmmsg
  net: sendmmsg should only return an error if no messages were sent
  ixgbe: fix PHY link setup for 82599
  ixgbe: fix __ixgbe_notify_dca() bail out code
  igb: fix WOL on second port of i350 device
  e1000e: minor re-order of #include files
  e1000e: remove unnecessary check for NULL pointer
  intel drivers: repair missing flush operations
  macb: restore wrap bit when performing underrun cleanup
  cdc_ncm: fix endianness problem.
  irda: use PCI_VENDOR_ID_*
  mlx4: Fixing Ethernet unicast packet steering
  net: fix NULL dereferences in check_peer_redir()
  bnx2x: Clear MDIO access warning during first driver load
  bnx2x: Fix BCM578xx MAC test
  bnx2x: Fix BCM54618se invalid link indication
  bnx2x: Fix BCM84833 link
  ...
parents 5fdb3247 c15fea2d

Documentation/networking/bonding.txt

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ num_unsol_na 
	affect only the active-backup mode.  These options were added for

	bonding versions 3.3.0 and 3.4.0 respectively.



	From Linux 2.6.40 and bonding version 3.7.1, these notifications

	From Linux 3.0 and bonding version 3.7.1, these notifications

	are generated by the ipv4 and ipv6 code and the numbers of

	repetitions cannot be set independently.

MAINTAINERS

+4 −6
Original line number Diff line number Diff line
@@ -2643,9 +2643,8 @@ S: Maintained 
F:	arch/x86/math-emu/



FRAME RELAY DLCI/FRAD (Sangoma drivers too)

M:	Mike McLagan <mike.mclagan@linux.org>

L:	netdev@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/net/wan/dlci.c

F:	drivers/net/wan/sdla.c
@@ -4415,10 +4414,10 @@ F: net/*/netfilter/ 
F:	net/netfilter/



NETLABEL

M:	Paul Moore <paul.moore@hp.com>

M:	Paul Moore <paul@paul-moore.com>

W:	http://netlabel.sf.net

L:	netdev@vger.kernel.org

S:	Supported

S:	Maintained

F:	Documentation/netlabel/

F:	include/net/netlabel.h

F:	net/netlabel/
@@ -4463,7 +4462,6 @@ F: include/linux/netdevice.h 
NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>

M:	Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>

M:	"Pekka Savola (ipv6)" <pekkas@netcore.fi>

M:	James Morris <jmorris@namei.org>

M:	Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

M:	Patrick McHardy <kaber@trash.net>
@@ -4476,7 +4474,7 @@ F: include/net/ip* 
F:	arch/x86/net/*



NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)

M:	Paul Moore <paul.moore@hp.com>

M:	Paul Moore <paul@paul-moore.com>

L:	netdev@vger.kernel.org

S:	Maintained

drivers/connector/cn_proc.c

+6 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ void proc_fork_connector(struct task_struct *task) 
	struct proc_event *ev;

	__u8 buffer[CN_PROC_MSG_SIZE];

	struct timespec ts;

	struct task_struct *parent;



	if (atomic_read(&proc_event_num_listeners) < 1)

		return;
@@ -67,8 +68,11 @@ void proc_fork_connector(struct task_struct *task) 
	ktime_get_ts(&ts); /* get high res monotonic timestamp */

	put_unaligned(timespec_to_ns(&ts), (__u64 *)&ev->timestamp_ns);

	ev->what = PROC_EVENT_FORK;

	ev->event_data.fork.parent_pid = task->real_parent->pid;

	ev->event_data.fork.parent_tgid = task->real_parent->tgid;

	rcu_read_lock();

	parent = rcu_dereference(task->real_parent);

	ev->event_data.fork.parent_pid = parent->pid;

	ev->event_data.fork.parent_tgid = parent->tgid;

	rcu_read_unlock();

	ev->event_data.fork.child_pid = task->pid;

	ev->event_data.fork.child_tgid = task->tgid;

drivers/net/bnx2x/bnx2x_cmn.c

+8 −2
Original line number Diff line number Diff line
@@ -1989,14 +1989,20 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) 
		return -EINVAL;

	}



	/*

	 * It's important to set the bp->state to the value different from

	 * BNX2X_STATE_OPEN and only then stop the Tx. Otherwise bnx2x_tx_int()

	 * may restart the Tx from the NAPI context (see bnx2x_tx_int()).

	 */

	bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT;

	smp_mb();



	/* Stop Tx */

	bnx2x_tx_disable(bp);



#ifdef BCM_CNIC

	bnx2x_cnic_notify(bp, CNIC_CTL_STOP_CMD);

#endif

	bp->state = BNX2X_STATE_CLOSING_WAIT4_HALT;

	smp_mb();



	bp->rx_mode = BNX2X_RX_MODE_NONE;

drivers/net/bnx2x/bnx2x_hsi.h

+2 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,8 @@ struct drv_port_mb { 


	#define LINK_STATUS_PFC_ENABLED				0x20000000



	#define LINK_STATUS_PHYSICAL_LINK_FLAG			0x40000000



	u32 port_stx;



	u32 stat_nig_timer;