projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6-microblaze.git]
/
net
/
ipv4
/
netfilter
/
ipt_CLUSTERIP.c
diff --git
a/net/ipv4/netfilter/ipt_CLUSTERIP.c
b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index
0886f96
..
a992dc8
100644
(file)
--- a/
net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/
net/ipv4/netfilter/ipt_CLUSTERIP.c
@@
-14,6
+14,7
@@
#include <linux/jhash.h>
#include <linux/bitops.h>
#include <linux/skbuff.h>
#include <linux/jhash.h>
#include <linux/bitops.h>
#include <linux/skbuff.h>
+#include <linux/slab.h>
#include <linux/ip.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/ip.h>
#include <linux/tcp.h>
#include <linux/udp.h>
@@
-87,7
+88,7
@@
clusterip_config_entry_put(struct clusterip_config *c)
list_del(&c->list);
write_unlock_bh(&clusterip_lock);
list_del(&c->list);
write_unlock_bh(&clusterip_lock);
- dev_mc_del
ete(c->dev, c->clustermac, ETH_ALEN, 0
);
+ dev_mc_del
(c->dev, c->clustermac
);
dev_put(c->dev);
/* In case anyone still accesses the file, the open/close
dev_put(c->dev);
/* In case anyone still accesses the file, the open/close
@@
-396,7
+397,7
@@
static bool clusterip_tg_check(const struct xt_tgchk_param *par)
dev_put(dev);
return false;
}
dev_put(dev);
return false;
}
- dev_mc_add(config->dev,
config->clustermac, ETH_ALEN, 0
);
+ dev_mc_add(config->dev,
config->clustermac
);
}
}
cipinfo->config = config;
}
}
cipinfo->config = config;