diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-02 01:05:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 16:43:40 -0500 |
commit | 3b6a94bed0029a6b48055d89b8dea0567abca0ac (patch) | |
tree | 97ba52a0d8d6ae197f9a76c4c34c8a760719cf0b /include/net | |
parent | 46d4e47abee04c24055114d50e408078a09c4d36 (diff) |
ax25: Refactor to use private neighbour operations.
AX25 already has it's own private arp cache operations to isolate
it's abuse of dev_rebuild_header to transmit packets. Add a function
ax25_neigh_construct that will allow all of the ax25 devices to
force using these operations, so that the generic arp code does
not need to.
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-hams@vger.kernel.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ax25.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 7385a64b61b8..45feeba7a325 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/list.h> | 12 | #include <linux/list.h> |
13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
14 | #include <linux/atomic.h> | 14 | #include <linux/atomic.h> |
15 | #include <net/neighbour.h> | ||
15 | 16 | ||
16 | #define AX25_T1CLAMPLO 1 | 17 | #define AX25_T1CLAMPLO 1 |
17 | #define AX25_T1CLAMPHI (30 * HZ) | 18 | #define AX25_T1CLAMPHI (30 * HZ) |
@@ -366,7 +367,11 @@ int ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *, | |||
366 | struct net_device *); | 367 | struct net_device *); |
367 | 368 | ||
368 | /* ax25_ip.c */ | 369 | /* ax25_ip.c */ |
370 | int ax25_neigh_construct(struct neighbour *neigh); | ||
369 | extern const struct header_ops ax25_header_ops; | 371 | extern const struct header_ops ax25_header_ops; |
372 | struct ax25_neigh_priv { | ||
373 | struct neigh_ops ops; | ||
374 | }; | ||
370 | 375 | ||
371 | /* ax25_out.c */ | 376 | /* ax25_out.c */ |
372 | ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *, | 377 | ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *, |