ax25: Stop using magic neighbour cache operations.
Before the ax25 stack calls dev_queue_xmit it always calls ax25_type_trans which sets skb->protocol to ETH_P_AX25. Which means that by looking at the protocol type it is possible to detect IP packets that have not been munged by the ax25 stack in ndo_start_xmit and call a function to munge them. Rename ax25_neigh_xmit to ax25_ip_xmit and tweak the return type and value to be appropriate for an ndo_start_xmit function. Update all of the ax25 devices to test the protocol type for ETH_P_IP and return ax25_ip_xmit as the first thing they do. This preserves the existing semantics of IP packet processing, but the timing will be a little different as the IP packets now pass through the qdisc layer before reaching the ax25 ip packet processing. Remove the now unnecessary ax25 neighbour table operations. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
bcc90e3fb1
commit
1d5da757da
@@ -367,11 +367,8 @@ int ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *,
|
||||
struct net_device *);
|
||||
|
||||
/* ax25_ip.c */
|
||||
int ax25_neigh_construct(struct neighbour *neigh);
|
||||
netdev_tx_t ax25_ip_xmit(struct sk_buff *skb);
|
||||
extern const struct header_ops ax25_header_ops;
|
||||
struct ax25_neigh_priv {
|
||||
struct neigh_ops ops;
|
||||
};
|
||||
|
||||
/* ax25_out.c */
|
||||
ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *,
|
||||
|
Reference in New Issue
Block a user