projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netport_con.c: fix build errors and warnings
[cascardo/linux.git]
/
drivers
/
net
/
ppp_synctty.c
diff --git
a/drivers/net/ppp_synctty.c
b/drivers/net/ppp_synctty.c
index
b6f0e9a
..
ce64032
100644
(file)
--- a/
drivers/net/ppp_synctty.c
+++ b/
drivers/net/ppp_synctty.c
@@
-207,13
+207,12
@@
ppp_sync_open(struct tty_struct *tty)
struct syncppp *ap;
int err;
struct syncppp *ap;
int err;
- ap = k
m
alloc(sizeof(*ap), GFP_KERNEL);
+ ap = k
z
alloc(sizeof(*ap), GFP_KERNEL);
err = -ENOMEM;
if (ap == 0)
goto out;
/* initialize the syncppp structure */
err = -ENOMEM;
if (ap == 0)
goto out;
/* initialize the syncppp structure */
- memset(ap, 0, sizeof(*ap));
ap->tty = tty;
ap->mru = PPP_MRU;
spin_lock_init(&ap->xmit_lock);
ap->tty = tty;
ap->mru = PPP_MRU;
spin_lock_init(&ap->xmit_lock);
@@
-594,7
+593,8
@@
ppp_sync_txmunge(struct syncppp *ap, struct sk_buff *skb)
return NULL;
}
skb_reserve(npkt,2);
return NULL;
}
skb_reserve(npkt,2);
- memcpy(skb_put(npkt,skb->len), skb->data, skb->len);
+ skb_copy_from_linear_data(skb,
+ skb_put(npkt, skb->len), skb->len);
kfree_skb(skb);
skb = npkt;
}
kfree_skb(skb);
skb = npkt;
}