summaryrefslogtreecommitdiffstats
path: root/net/ax25
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2015-03-02 00:08:43 -0600
committerDavid S. Miller <davem@davemloft.net>2015-03-02 16:43:40 -0500
commitabb7b755d9af48c762a6f814e4cead677e694f93 (patch)
tree572544cab2be06553470b49e2330944422de3170 /net/ax25
parentdef6775369fab9d36817b9a6bc58cab67f53f1dc (diff)
downloadlinux-stable-abb7b755d9af48c762a6f814e4cead677e694f93.tar.gz
linux-stable-abb7b755d9af48c762a6f814e4cead677e694f93.tar.bz2
linux-stable-abb7b755d9af48c762a6f814e4cead677e694f93.zip
ax25: Stop calling/abusing dev_rebuild_header
- Rename ax25_rebuild_header to ax25_neigh_xmit and call it from ax25_neigh_output directly. The rename is to make it clear that this is not a rebuild_header operation. - Remove ax25_rebuild_header from ax25_header_ops. 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/ax25')
-rw-r--r--net/ax25/ax25_ip.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index cc7415b33cfb..08803e820f1d 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -100,7 +100,7 @@ static int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
return -AX25_HEADER_LEN; /* Unfinished header */
}
-static int ax25_rebuild_header(struct sk_buff *skb)
+static int ax25_neigh_xmit(struct sk_buff *skb)
{
struct sk_buff *ourskb;
unsigned char *bp = skb->data;
@@ -224,7 +224,7 @@ static int ax25_neigh_output(struct neighbour *neigh, struct sk_buff *skb)
if (dev_hard_header(skb, dev, ntohs(skb->protocol), NULL, NULL,
skb->len) < 0 &&
- dev_rebuild_header(skb))
+ ax25_neigh_xmit(skb));
return 0;
return dev_queue_xmit(skb);
@@ -255,11 +255,6 @@ static int ax25_hard_header(struct sk_buff *skb, struct net_device *dev,
return -AX25_HEADER_LEN;
}
-static int ax25_rebuild_header(struct sk_buff *skb)
-{
- return 1;
-}
-
int ax25_neigh_construct(struct neighbour *neigh)
{
return 0;
@@ -268,7 +263,6 @@ int ax25_neigh_construct(struct neighbour *neigh)
const struct header_ops ax25_header_ops = {
.create = ax25_hard_header,
- .rebuild = ax25_rebuild_header,
};
EXPORT_SYMBOL(ax25_header_ops);