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_route.c
diff --git
a/net/ax25/ax25_route.c
b/net/ax25/ax25_route.c
index
0a03816
..
9ecf6f1
100644
(file)
--- a/
net/ax25/ax25_route.c
+++ b/
net/ax25/ax25_route.c
@@
-87,7
+87,7
@@
static int __must_check ax25_rt_add(struct ax25_routes_struct *route)
ax25_rt = ax25_route_list;
while (ax25_rt != NULL) {
if (ax25cmp(&ax25_rt->callsign, &route->dest_addr) == 0 &&
ax25_rt = ax25_route_list;
while (ax25_rt != NULL) {
if (ax25cmp(&ax25_rt->callsign, &route->dest_addr) == 0 &&
- ax25_rt->dev == ax25_dev->dev) {
+ ax25_rt->dev == ax25_dev->dev) {
kfree(ax25_rt->digipeat);
ax25_rt->digipeat = NULL;
if (route->digi_count != 0) {
kfree(ax25_rt->digipeat);
ax25_rt->digipeat = NULL;
if (route->digi_count != 0) {
@@
-252,8
+252,8
@@
static void *ax25_rt_seq_start(struct seq_file *seq, loff_t *pos)
{
struct ax25_route *ax25_rt;
int i = 1;
{
struct ax25_route *ax25_rt;
int i = 1;
-
- read_lock(&ax25_route_lock);
+
+ read_lock(&ax25_route_lock);
if (*pos == 0)
return SEQ_START_TOKEN;
if (*pos == 0)
return SEQ_START_TOKEN;
@@
-269,7
+269,7
@@
static void *ax25_rt_seq_start(struct seq_file *seq, loff_t *pos)
static void *ax25_rt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
++*pos;
static void *ax25_rt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
++*pos;
- return (v == SEQ_START_TOKEN) ? ax25_route_list :
+ return (v == SEQ_START_TOKEN) ? ax25_route_list :
((struct ax25_route *) v)->next;
}
((struct ax25_route *) v)->next;
}
@@
-320,7
+320,7
@@
static int ax25_rt_seq_show(struct seq_file *seq, void *v)
return 0;
}
return 0;
}
-static struct seq_operations ax25_rt_seqops = {
+static
const
struct seq_operations ax25_rt_seqops = {
.start = ax25_rt_seq_start,
.next = ax25_rt_seq_next,
.stop = ax25_rt_seq_stop,
.start = ax25_rt_seq_start,
.next = ax25_rt_seq_next,
.stop = ax25_rt_seq_stop,
@@
-332,7
+332,7
@@
static int ax25_rt_info_open(struct inode *inode, struct file *file)
return seq_open(file, &ax25_rt_seqops);
}
return seq_open(file, &ax25_rt_seqops);
}
-struct file_operations ax25_route_fops = {
+
const
struct file_operations ax25_route_fops = {
.owner = THIS_MODULE,
.open = ax25_rt_info_open,
.read = seq_read,
.owner = THIS_MODULE,
.open = ax25_rt_info_open,
.read = seq_read,