From 409a413fd82569b06466d754847b3889b4b30f69 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Tue, 28 Sep 2010 17:08:02 +0000 Subject: [PATCH] --- yaml --- r: 214808 b: refs/heads/master c: a64de47c091e4a337fa9763315cb6f2fbf0c583b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/arp.h | 2 -- trunk/net/ipv4/arp.c | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 515e40ac0cca..5b2372b8111a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfa5ae63b823f4ffd3483a05f60a93a4a7b7d680 +refs/heads/master: a64de47c091e4a337fa9763315cb6f2fbf0c583b diff --git a/trunk/include/net/arp.h b/trunk/include/net/arp.h index 716f43c5c98e..f4cf6ce66586 100644 --- a/trunk/include/net/arp.h +++ b/trunk/include/net/arp.h @@ -26,6 +26,4 @@ extern struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, const unsigned char *target_hw); extern void arp_xmit(struct sk_buff *skb); -extern const struct neigh_ops arp_broken_ops; - #endif /* _ARP_H */ diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c index 4083c186fd30..d9031ad67826 100644 --- a/trunk/net/ipv4/arp.c +++ b/trunk/net/ipv4/arp.c @@ -161,7 +161,7 @@ static const struct neigh_ops arp_direct_ops = { .queue_xmit = dev_queue_xmit, }; -const struct neigh_ops arp_broken_ops = { +static const struct neigh_ops arp_broken_ops = { .family = AF_INET, .solicit = arp_solicit, .error_report = arp_error_report, @@ -170,7 +170,6 @@ const struct neigh_ops arp_broken_ops = { .hh_output = dev_queue_xmit, .queue_xmit = dev_queue_xmit, }; -EXPORT_SYMBOL(arp_broken_ops); struct neigh_table arp_tbl = { .family = AF_INET,