neigh: Kill ndisc_ops->queue_xmit

[pandora-kernel.git] / net / decnet / dn_neigh.c

diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index abf4de8..84fee8a 100644 (file)
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -64,7 +64,6 @@ static const struct neigh_ops dn_long_ops = {
        .error_report =         dn_long_error_report,
        .output =               dn_long_output,
        .connected_output =     dn_long_output,
-       .queue_xmit =           dev_queue_xmit,
 };
 
 /*
@@ -75,7 +74,6 @@ static const struct neigh_ops dn_short_ops = {
        .error_report =         dn_short_error_report,
        .output =               dn_short_output,
        .connected_output =     dn_short_output,
-       .queue_xmit =           dev_queue_xmit,
 };
 
 /*
@@ -86,7 +84,6 @@ static const struct neigh_ops dn_phase3_ops = {
        .error_report =         dn_short_error_report, /* Can use short version here */
        .output =               dn_phase3_output,
        .connected_output =     dn_phase3_output,
-       .queue_xmit =           dev_queue_xmit
 };
 
 static u32 dn_neigh_hash(const void *pkey,
@@ -212,7 +209,7 @@ static int dn_neigh_output_packet(struct sk_buff *skb)
        dn_dn2eth(mac_addr, rt->rt_local_src);
        if (dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha,
                            mac_addr, skb->len) >= 0)
-               return neigh->ops->queue_xmit(skb);
+               return dev_queue_xmit(skb);
 
        if (net_ratelimit())
                printk(KERN_DEBUG "dn_neigh_output_packet: oops, can't send packet\n");