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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
bluetooth
/
bnep
/
core.c
diff --git
a/net/bluetooth/bnep/core.c
b/net/bluetooth/bnep/core.c
index
a87cc64
..
d908d49
100644
(file)
--- a/
net/bluetooth/bnep/core.c
+++ b/
net/bluetooth/bnep/core.c
@@
-75,7
+75,7
@@
static struct bnep_session *__bnep_get_session(u8 *dst)
list_for_each(p, &bnep_session_list) {
s = list_entry(p, struct bnep_session, list);
list_for_each(p, &bnep_session_list) {
s = list_entry(p, struct bnep_session, list);
- if (!
memcmp(dst, s->eh.h_source, ETH_ALEN
))
+ if (!
compare_ether_addr(dst, s->eh.h_source
))
return s;
}
return NULL;
return s;
}
return NULL;
@@
-384,7
+384,7
@@
static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
s->stats.rx_packets++;
nskb->dev = dev;
s->stats.rx_packets++;
nskb->dev = dev;
- nskb->ip_summed = CHECKSUM_
UNNECESSARY
;
+ nskb->ip_summed = CHECKSUM_
NONE
;
nskb->protocol = eth_type_trans(nskb, dev);
netif_rx_ni(nskb);
return 0;
nskb->protocol = eth_type_trans(nskb, dev);
netif_rx_ni(nskb);
return 0;
@@
-420,10
+420,10
@@
static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
iv[il++] = (struct kvec) { &type, 1 };
len++;
iv[il++] = (struct kvec) { &type, 1 };
len++;
- if (!
memcmp(eh->h_dest, s->eh.h_source, ETH_ALEN
))
+ if (!
compare_ether_addr(eh->h_dest, s->eh.h_source
))
type |= 0x01;
type |= 0x01;
- if (!
memcmp(eh->h_source, s->eh.h_dest, ETH_ALEN
))
+ if (!
compare_ether_addr(eh->h_source, s->eh.h_dest
))
type |= 0x02;
if (type)
type |= 0x02;
if (type)
@@
-532,8
+532,8
@@
int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
dev = alloc_netdev(sizeof(struct bnep_session),
(*req->device) ? req->device : "bnep%d",
bnep_net_setup);
dev = alloc_netdev(sizeof(struct bnep_session),
(*req->device) ? req->device : "bnep%d",
bnep_net_setup);
- if (!dev)
- return ENOMEM;
+ if (!dev)
+ return
-
ENOMEM;
down_write(&bnep_session_sem);
down_write(&bnep_session_sem);