diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-02 00:06:31 -0600 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 16:43:40 -0500 |
commit | 21bfb8e93301e55760dde9f775e58fd6c4f248f8 (patch) | |
tree | 492b7f18f2ee31cf17a7998d9c1d48080226d473 /net/ipv4/arp.c | |
parent | 3b6a94bed0029a6b48055d89b8dea0567abca0ac (diff) |
arp: Remove special case to give AX25 it's open arp operations.
The special case has been pushed out into ax25_neigh_construct so there
is no need to keep this code in arp.c
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
-rw-r--r-- | net/ipv4/arp.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 205e1472aa78..2557cf9a4648 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -149,14 +149,6 @@ static const struct neigh_ops arp_direct_ops = { .connected_output = neigh_direct_output, }; -static const struct neigh_ops arp_broken_ops = { - .family = AF_INET, - .solicit = arp_solicit, - .error_report = arp_error_report, - .output = neigh_compat_output, - .connected_output = neigh_compat_output, -}; - struct neigh_table arp_tbl = { .family = AF_INET, .key_len = 4, @@ -260,35 +252,6 @@ static int arp_constructor(struct neighbour *neigh) in old paradigm. */ -#if 1 - /* So... these "amateur" devices are hopeless. - The only thing, that I can say now: - It is very sad that we need to keep ugly obsolete - code to make them happy. - - They should be moved to more reasonable state, now - they use rebuild_header INSTEAD OF hard_start_xmit!!! - Besides that, they are sort of out of date - (a lot of redundant clones/copies, useless in 2.1), - I wonder why people believe that they work. - */ - switch (dev->type) { - default: - break; - case ARPHRD_ROSE: -#if IS_ENABLED(CONFIG_AX25) - case ARPHRD_AX25: -#if IS_ENABLED(CONFIG_NETROM) - case ARPHRD_NETROM: -#endif - neigh->ops = &arp_broken_ops; - neigh->output = neigh->ops->output; - return 0; -#else - break; -#endif - } -#endif if (neigh->type == RTN_MULTICAST) { neigh->nud_state = NUD_NOARP; arp_mc_map(addr, neigh->ha, dev, 1); |