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

Commit 1b4c8af8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

parents 3da3f872 384b90ab

MAINTAINERS

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

F:	arch/x86/math-emu/





FRAME RELAY DLCI/FRAD (Sangoma drivers too)

FRAME RELAY DLCI/FRAD (Sangoma drivers too)

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

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/net/wan/dlci.c

F:	drivers/net/wan/dlci.c

F:	drivers/net/wan/sdla.c

F:	drivers/net/wan/sdla.c

drivers/connector/cn_proc.c

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

	struct proc_event *ev;

	__u8 buffer[CN_PROC_MSG_SIZE];

	__u8 buffer[CN_PROC_MSG_SIZE];

	struct timespec ts;

	struct timespec ts;

	struct task_struct *parent;





	if (atomic_read(&proc_event_num_listeners) < 1)

	if (atomic_read(&proc_event_num_listeners) < 1)

		return;

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

	ktime_get_ts(&ts); /* get high res monotonic timestamp */

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

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

	ev->what = PROC_EVENT_FORK;

	ev->what = PROC_EVENT_FORK;

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

	rcu_read_lock();

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

	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_pid = task->pid;

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

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

drivers/net/r8169.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -239,6 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8168), 0, 0, RTL_CFG_1 },

	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8168), 0, 0, RTL_CFG_1 },

	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8169), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK,	0x8169), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4300), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_DLINK,	0x4302), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_AT,		0xc107), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_AT,		0xc107), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(0x16ec,			0x0116), 0, 0, RTL_CFG_0 },

	{ PCI_DEVICE(0x16ec,			0x0116), 0, 0, RTL_CFG_0 },

	{ PCI_VENDOR_ID_LINKSYS,		0x1032,

	{ PCI_VENDOR_ID_LINKSYS,		0x1032,

drivers/net/sis190.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -1825,6 +1825,16 @@ static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
		generic_mii_ioctl(&tp->mii_if, if_mii(ifr), cmd, NULL);

		generic_mii_ioctl(&tp->mii_if, if_mii(ifr), cmd, NULL);

}

}





static int sis190_mac_addr(struct net_device  *dev, void *p)

{

	int rc;



	rc = eth_mac_addr(dev, p);

	if (!rc)

		sis190_init_rxfilter(dev);

	return rc;

}



static const struct net_device_ops sis190_netdev_ops = {

static const struct net_device_ops sis190_netdev_ops = {

	.ndo_open		= sis190_open,

	.ndo_open		= sis190_open,

	.ndo_stop		= sis190_close,

	.ndo_stop		= sis190_close,
@@ -1833,7 +1843,7 @@ static const struct net_device_ops sis190_netdev_ops = { 
	.ndo_tx_timeout		= sis190_tx_timeout,

	.ndo_tx_timeout		= sis190_tx_timeout,

	.ndo_set_multicast_list = sis190_set_rx_mode,

	.ndo_set_multicast_list = sis190_set_rx_mode,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_change_mtu		= eth_change_mtu,

	.ndo_set_mac_address 	= eth_mac_addr,

	.ndo_set_mac_address	= sis190_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_validate_addr	= eth_validate_addr,

#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	 = sis190_netpoll,

	.ndo_poll_controller	 = sis190_netpoll,

net/netfilter/ipvs/ip_vs_ctl.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -3771,6 +3771,7 @@ int __init ip_vs_control_init(void) 
void ip_vs_control_cleanup(void)

void ip_vs_control_cleanup(void)

{

{

	EnterFunction(2);

	EnterFunction(2);

	unregister_netdevice_notifier(&ip_vs_dst_notifier);

	ip_vs_genl_unregister();

	ip_vs_genl_unregister();

	nf_unregister_sockopt(&ip_vs_sockopts);

	nf_unregister_sockopt(&ip_vs_sockopts);

	LeaveFunction(2);

	LeaveFunction(2);