Commit 0f0ada4d authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents f8f3d12d a968a3a5
......@@ -4232,7 +4232,7 @@ void mgslpc_sppp_init(MGSLPC_INFO *info)
d->tx_timeout = mgslpc_sppp_tx_timeout;
d->watchdog_timeo = 10*HZ;
if (register_netdev(d) == -1) {
if (register_netdev(d)) {
printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
sppp_detach(info->netdev);
return;
......
......@@ -7847,7 +7847,7 @@ void mgsl_sppp_init(struct mgsl_struct *info)
d->tx_timeout = mgsl_sppp_tx_timeout;
d->watchdog_timeo = 10*HZ;
if (register_netdev(d) == -1) {
if (register_netdev(d)) {
printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
sppp_detach(info->netdev);
return;
......
......@@ -1653,7 +1653,7 @@ static void sppp_init(SLMP_INFO *info)
d->tx_timeout = sppp_cb_tx_timeout;
d->watchdog_timeo = 10*HZ;
if (register_netdev(d) == -1) {
if (register_netdev(d)) {
printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
sppp_detach(info->netdev);
return;
......
......@@ -337,7 +337,7 @@ static struct sv11_device *sv11_init(int iobase, int irq)
d->neigh_setup = hostess_neigh_setup_dev;
d->set_mac_address = NULL;
if(register_netdev(d)==-1)
if(register_netdev(d))
{
printk(KERN_ERR "%s: unable to register device.\n",
d->name);
......
......@@ -24,10 +24,8 @@
#include <linux/if.h> /* for IFF_UP */
#include <linux/inetdevice.h>
#include <linux/bitops.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#endif
#include <net/route.h> /* for struct rtable and routing */
#include <net/icmp.h> /* icmp_send */
#include <asm/param.h> /* for HZ */
......
......@@ -412,6 +412,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
#endif
#ifdef CONFIG_NETFILTER
to->nfmark = from->nfmark;
to->nfcache = from->nfcache;
/* Connection association is same as pre-frag packet */
to->nfct = from->nfct;
nf_conntrack_get(to->nfct);
......
......@@ -5,8 +5,8 @@
*/
#include <linux/config.h>
#ifdef CONFIG_PROC_FS
#include <linux/init.h>
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/seq_file.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment