From deffb6a3375c2f6ea27c3fdb4d80c6ad5ba6973d Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Thu, 6 Dec 2012 10:04:04 +0800 Subject: [PATCH] --- yaml --- r: 341890 b: refs/heads/master c: b93196dc5af7729ff7cc50d3d322ab1a364aa14f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/neighbour.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 94b1167e5ff6..108ea484d16d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2d3babfafbb9f6629cfb47139758e59a5eb0d80 +refs/heads/master: b93196dc5af7729ff7cc50d3d322ab1a364aa14f diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c index 36fc692e2bde..c815f285e5ab 100644 --- a/trunk/net/core/neighbour.c +++ b/trunk/net/core/neighbour.c @@ -62,9 +62,6 @@ static void __neigh_notify(struct neighbour *n, int type, int flags); static void neigh_update_notify(struct neighbour *neigh); static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev); -static int zero; -static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN); - static struct neigh_table *neigh_tables; #ifdef CONFIG_PROC_FS static const struct file_operations neigh_stat_seq_fops; @@ -2772,6 +2769,8 @@ EXPORT_SYMBOL(neigh_app_ns); #endif /* CONFIG_ARPD */ #ifdef CONFIG_SYSCTL +static int zero; +static int unres_qlen_max = INT_MAX / SKB_TRUESIZE(ETH_FRAME_LEN); static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos)