projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...
[powerpc.git]
/
net
/
ax25
/
ax25_addr.c
diff --git
a/net/ax25/ax25_addr.c
b/net/ax25/ax25_addr.c
index
21a0616
..
7e7964d
100644
(file)
--- a/
net/ax25/ax25_addr.c
+++ b/
net/ax25/ax25_addr.c
@@
-12,7
+12,6
@@
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/in.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
#include <linux/timer.h>
#include <linux/string.h>
#include <linux/sockios.h>
@@
-83,7
+82,7
@@
EXPORT_SYMBOL(ax2asc);
*/
void asc2ax(ax25_address *addr, const char *callsign)
{
*/
void asc2ax(ax25_address *addr, const char *callsign)
{
- char *s;
+ c
onst c
har *s;
int n;
for (s = callsign, n = 0; n < 6; n++) {
int n;
for (s = callsign, n = 0; n < 6; n++) {
@@
-126,10
+125,10
@@
int ax25cmp(const ax25_address *a, const ax25_address *b)
ct++;
}
ct++;
}
- if ((a->ax25_call[ct] & 0x1E) == (b->ax25_call[ct] & 0x1E)) /* SSID without control bit */
- return 0;
+ if ((a->ax25_call[ct] & 0x1E) == (b->ax25_call[ct] & 0x1E)) /* SSID without control bit */
+ return 0;
- return 2; /* Partial match */
+ return 2; /* Partial match */
}
EXPORT_SYMBOL(ax25cmp);
}
EXPORT_SYMBOL(ax25cmp);