diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /net/netrom/nr_route.c | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'net/netrom/nr_route.c')
| -rw-r--r-- | net/netrom/nr_route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index fd36a887e..308e73af2 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -122,7 +122,7 @@ static int nr_add_node(ax25_address *nr, const char *mnemonic, ax25_address *ax2 kfree(nr_neigh); return -ENOMEM; } - *nr_neigh->digipeat = *ax25_digi; + memcpy(nr_neigh->digipeat, ax25_digi, sizeof(ax25_digi)); } save_flags(flags); @@ -402,7 +402,7 @@ static int nr_add_neigh(ax25_address *callsign, ax25_digi *ax25_digi, struct net kfree(nr_neigh); return -ENOMEM; } - *nr_neigh->digipeat = *ax25_digi; + memcpy(nr_neigh->digipeat, ax25_digi, sizeof(ax25_digi)); } save_flags(flags); |