UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
David S. Miller 2011-08-01 00:09:40 -07:00
parent 3da3f872aa 384b90abeb
commit 1b4c8af8d2
7 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MAINTAINERS
View File

@ -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

8
drivers/connector/cn_proc.c
View File

@ -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;

1
drivers/net/r8169.c
View File

@ -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,

12
drivers/net/sis190.c
View File

@ -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,

1
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -3771,6 +3771,7 @@ err_sock:
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);

1
net/sunrpc/xprt.c
View File

@ -187,6 +187,7 @@ EXPORT_SYMBOL_GPL(xprt_load_transport);
/** /**
* xprt_reserve_xprt - serialize write access to transports * xprt_reserve_xprt - serialize write access to transports
* @task: task that is requesting access to the transport * @task: task that is requesting access to the transport
* @xprt: pointer to the target transport
* *
* This prevents mixing the payload of separate requests, and prevents * This prevents mixing the payload of separate requests, and prevents
* transport connects from colliding with writes. No congestion control * transport connects from colliding with writes. No congestion control

4
net/xfrm/xfrm_algo.c
View File

@ -462,8 +462,8 @@ static struct xfrm_algo_desc ealg_list[] = {
.desc = { .desc = {
.sadb_alg_id = SADB_X_EALG_AESCTR, .sadb_alg_id = SADB_X_EALG_AESCTR,
.sadb_alg_ivlen = 8, .sadb_alg_ivlen = 8,
.sadb_alg_minbits = 128, .sadb_alg_minbits = 160,
.sadb_alg_maxbits = 256 .sadb_alg_maxbits = 288
} }
}, },
}; };