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/ax25 | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_in.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_out.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_route.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index d99065efe..57718cf00 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -964,7 +964,7 @@ struct sock *ax25_make_new(struct sock *osk, struct ax25_dev *ax25_dev) return NULL; } - *ax25->digipeat = *osk->protinfo.ax25->digipeat; + memcpy(ax25->digipeat, osk->protinfo.ax25->digipeat, sizeof(ax25_digi)); } sk->protinfo.ax25 = ax25; diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index f4b5e1a75..6efbc57f2 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -426,7 +426,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, ax25_address *d } } else { /* Reverse the source SABM's path */ - *ax25->digipeat = reverse_dp; + memcpy(&ax25->digipeat, &reverse_dp, sizeof(ax25_digi)); } if ((*skb->data & ~AX25_PF) == AX25_SABME) { diff --git a/net/ax25/ax25_out.c b/net/ax25/ax25_out.c index 719059b21..e6b19f53b 100644 --- a/net/ax25/ax25_out.c +++ b/net/ax25/ax25_out.c @@ -98,7 +98,7 @@ ax25_cb *ax25_send_frame(struct sk_buff *skb, int paclen, ax25_address *src, ax2 ax25_free_cb(ax25); return NULL; } - *ax25->digipeat = *digi; + memcpy(ax25->digipeat, digi, sizeof(ax25_digi)); } switch (ax25->ax25_dev->values[AX25_VALUES_PROTOCOL]) { diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index e92a1b39e..6d58c5d04 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c @@ -373,7 +373,7 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25_address *addr) if (ax25_rt->digipeat != NULL) { if ((ax25->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) return -ENOMEM; - *ax25->digipeat = *ax25_rt->digipeat; + memcpy(ax25->digipeat, ax25_rt->digipeat, sizeof(ax25_digi)); ax25_adjust_path(addr, ax25->digipeat); } |