From: Adrian Bunk <bunk@stusta.de>
To: ralf@linux-mips.org
Cc: linux-hams@vger.kernel.org, netdev@oss.sgi.com,
linux-kernel@vger.kernel.org
Subject: [2.6 patch] /net/ax25/: some cleanups
Date: Sun, 12 Dec 2004 22:13:39 +0100 [thread overview]
Message-ID: <20041212211339.GX22324@stusta.de> (raw)
The patch below contains the following cleanups:
- make two needlessly global functions static
- net/ax25/ax25_addr.c: remove the unused global function ax25digicmp
diffstat output:
include/net/ax25.h | 3 ---
net/ax25/af_ax25.c | 2 +-
net/ax25/ax25_addr.c | 20 --------------------
net/ax25/ax25_ds_subr.c | 2 +-
4 files changed, 2 insertions(+), 25 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc2-mm4-full/include/net/ax25.h.old 2004-12-12 18:56:04.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/include/net/ax25.h 2004-12-12 19:00:07.000000000 +0100
@@ -231,7 +231,6 @@
extern void ax25_destroy_socket(ax25_cb *);
extern ax25_cb *ax25_create_cb(void);
extern void ax25_fillin_cb(ax25_cb *, ax25_dev *);
-extern int ax25_create(struct socket *, int);
extern struct sock *ax25_make_new(struct sock *, struct ax25_dev *);
/* ax25_addr.c */
@@ -239,7 +238,6 @@
extern char *ax2asc(ax25_address *);
extern ax25_address *asc2ax(char *);
extern int ax25cmp(ax25_address *, ax25_address *);
-extern int ax25digicmp(ax25_digi *, ax25_digi *);
extern unsigned char *ax25_addr_parse(unsigned char *, int, ax25_address *, ax25_address *, ax25_digi *, int *, int *);
extern int ax25_addr_build(unsigned char *, ax25_address *, ax25_address *, ax25_digi *, int, int);
extern int ax25_addr_size(ax25_digi *);
@@ -268,7 +266,6 @@
extern void ax25_ds_nr_error_recovery(ax25_cb *);
extern void ax25_ds_enquiry_response(ax25_cb *);
extern void ax25_ds_establish_data_link(ax25_cb *);
-extern void ax25_dev_dama_on(ax25_dev *);
extern void ax25_dev_dama_off(ax25_dev *);
extern void ax25_dama_on(ax25_cb *);
extern void ax25_dama_off(ax25_cb *);
--- linux-2.6.10-rc2-mm4-full/net/ax25/af_ax25.c.old 2004-12-12 18:55:30.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/net/ax25/af_ax25.c 2004-12-12 18:55:41.000000000 +0100
@@ -755,7 +755,7 @@
return res;
}
-int ax25_create(struct socket *sock, int protocol)
+static int ax25_create(struct socket *sock, int protocol)
{
struct sock *sk;
ax25_cb *ax25;
--- linux-2.6.10-rc2-mm4-full/net/ax25/ax25_addr.c.old 2004-12-12 18:56:23.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/net/ax25/ax25_addr.c 2004-12-12 18:56:32.000000000 +0100
@@ -121,26 +121,6 @@
}
/*
- * Compare two AX.25 digipeater paths.
- */
-int ax25digicmp(ax25_digi *digi1, ax25_digi *digi2)
-{
- int i;
-
- if (digi1->ndigi != digi2->ndigi)
- return 1;
-
- if (digi1->lastrepeat != digi2->lastrepeat)
- return 1;
-
- for (i = 0; i < digi1->ndigi; i++)
- if (ax25cmp(&digi1->calls[i], &digi2->calls[i]) != 0)
- return 1;
-
- return 0;
-}
-
-/*
* Given an AX.25 address pull of to, from, digi list, command/response and the start of data
*
*/
--- linux-2.6.10-rc2-mm4-full/net/ax25/ax25_ds_subr.c.old 2004-12-12 18:57:03.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/net/ax25/ax25_ds_subr.c 2004-12-12 18:57:45.000000000 +0100
@@ -174,7 +174,7 @@
return res;
}
-void ax25_dev_dama_on(ax25_dev *ax25_dev)
+static void ax25_dev_dama_on(ax25_dev *ax25_dev)
{
if (ax25_dev == NULL)
return;
next reply other threads:[~2004-12-12 21:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-12 21:13 Adrian Bunk [this message]
2004-12-28 2:51 ` [2.6 patch] /net/ax25/: some cleanups David S. Miller
2004-12-28 14:27 ` Alan Cox
2004-12-28 18:05 ` David S. Miller
2004-12-28 21:54 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041212211339.GX22324@stusta.de \
--to=bunk@stusta.de \
--cc=linux-hams@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).