diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-02 00:07:37 -0600 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-02 16:43:40 -0500 |
| commit | def6775369fab9d36817b9a6bc58cab67f53f1dc (patch) | |
| tree | aa69d297f88e4e835d6b1b53114f4a4872d08da7 /net/core/neighbour.c | |
| parent | 21bfb8e93301e55760dde9f775e58fd6c4f248f8 (diff) | |
| download | linux-def6775369fab9d36817b9a6bc58cab67f53f1dc.tar.gz linux-def6775369fab9d36817b9a6bc58cab67f53f1dc.tar.bz2 linux-def6775369fab9d36817b9a6bc58cab67f53f1dc.zip | |
neigh: Move neigh_compat_output into ax25_ip.c
The only caller is now is ax25_neigh_construct so move
neigh_compat_output into ax25_ip.c make it static and rename it
ax25_neigh_output.
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 'net/core/neighbour.c')
| -rw-r--r-- | net/core/neighbour.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 70fe9e10ac86..8a319ff3e8d1 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1280,26 +1280,6 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst) write_unlock_bh(&n->lock); } -/* This function can be used in contexts, where only old dev_queue_xmit - * worked, f.e. if you want to override normal output path (eql, shaper), - * but resolution is not made yet. - */ - -int neigh_compat_output(struct neighbour *neigh, struct sk_buff *skb) -{ - struct net_device *dev = skb->dev; - - __skb_pull(skb, skb_network_offset(skb)); - - if (dev_hard_header(skb, dev, ntohs(skb->protocol), NULL, NULL, - skb->len) < 0 && - dev_rebuild_header(skb)) - return 0; - - return dev_queue_xmit(skb); -} -EXPORT_SYMBOL(neigh_compat_output); - /* Slow and careful. */ int neigh_resolve_output(struct neighbour *neigh, struct sk_buff *skb) |