projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge'
[powerpc.git]
/
net
/
ipv4
/
fib_hash.c
diff --git
a/net/ipv4/fib_hash.c
b/net/ipv4/fib_hash.c
index
2a8c9af
..
72c633b
100644
(file)
--- a/
net/ipv4/fib_hash.c
+++ b/
net/ipv4/fib_hash.c
@@
-15,7
+15,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
@@
-29,6
+28,7
@@
#include <linux/errno.h>
#include <linux/in.h>
#include <linux/inet.h>
#include <linux/errno.h>
#include <linux/in.h>
#include <linux/inet.h>
+#include <linux/inetdevice.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/proc_fs.h>
#include <linux/netdevice.h>
#include <linux/if_arp.h>
#include <linux/proc_fs.h>
@@
-204,11
+204,10
@@
static struct fn_zone *
fn_new_zone(struct fn_hash *table, int z)
{
int i;
fn_new_zone(struct fn_hash *table, int z)
{
int i;
- struct fn_zone *fz = k
m
alloc(sizeof(struct fn_zone), GFP_KERNEL);
+ struct fn_zone *fz = k
z
alloc(sizeof(struct fn_zone), GFP_KERNEL);
if (!fz)
return NULL;
if (!fz)
return NULL;
- memset(fz, 0, sizeof(struct fn_zone));
if (z) {
fz->fz_divisor = 16;
} else {
if (z) {
fz->fz_divisor = 16;
} else {
@@
-975,7
+974,7
@@
static void fib_seq_stop(struct seq_file *seq, void *v)
static unsigned fib_flag_trans(int type, u32 mask, struct fib_info *fi)
{
static unsigned fib_flag_trans(int type, u32 mask, struct fib_info *fi)
{
- static unsigned type2flags[RTN_MAX + 1] = {
+ static
const
unsigned type2flags[RTN_MAX + 1] = {
[7] = RTF_REJECT, [8] = RTF_REJECT,
};
unsigned flags = type2flags[type];
[7] = RTF_REJECT, [8] = RTF_REJECT,
};
unsigned flags = type2flags[type];
@@
-1046,7
+1045,7
@@
static int fib_seq_open(struct inode *inode, struct file *file)
{
struct seq_file *seq;
int rc = -ENOMEM;
{
struct seq_file *seq;
int rc = -ENOMEM;
- struct fib_iter_state *s = k
m
alloc(sizeof(*s), GFP_KERNEL);
+ struct fib_iter_state *s = k
z
alloc(sizeof(*s), GFP_KERNEL);
if (!s)
goto out;
if (!s)
goto out;
@@
-1057,7
+1056,6
@@
static int fib_seq_open(struct inode *inode, struct file *file)
seq = file->private_data;
seq->private = s;
seq = file->private_data;
seq->private = s;
- memset(s, 0, sizeof(*s));
out:
return rc;
out_kfree:
out:
return rc;
out_kfree: