git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
llc
/
llc_core.c
diff --git
a/net/llc/llc_core.c
b/net/llc/llc_core.c
index
ab0fcd3
..
d12413c
100644
(file)
--- a/
net/llc/llc_core.c
+++ b/
net/llc/llc_core.c
@@
-33,10
+33,9
@@
unsigned char llc_station_mac_sa[ETH_ALEN];
*/
static struct llc_sap *llc_sap_alloc(void)
{
*/
static struct llc_sap *llc_sap_alloc(void)
{
- struct llc_sap *sap = k
m
alloc(sizeof(*sap), GFP_ATOMIC);
+ struct llc_sap *sap = k
z
alloc(sizeof(*sap), GFP_ATOMIC);
if (sap) {
if (sap) {
- memset(sap, 0, sizeof(*sap));
sap->state = LLC_SAP_STATE_ACTIVE;
memcpy(sap->laddr.mac, llc_station_mac_sa, ETH_ALEN);
rwlock_init(&sap->sk_list.lock);
sap->state = LLC_SAP_STATE_ACTIVE;
memcpy(sap->laddr.mac, llc_station_mac_sa, ETH_ALEN);
rwlock_init(&sap->sk_list.lock);
@@
-127,7
+126,6
@@
struct llc_sap *llc_sap_open(unsigned char lsap,
goto out;
sap->laddr.lsap = lsap;
sap->rcv_func = func;
goto out;
sap->laddr.lsap = lsap;
sap->rcv_func = func;
- llc_sap_hold(sap);
llc_add_sap(sap);
out:
write_unlock_bh(&llc_sap_list_lock);
llc_add_sap(sap);
out:
write_unlock_bh(&llc_sap_list_lock);