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
vserver 1.9.3
[linux-2.6.git]
/
net
/
atm
/
br2684.c
diff --git
a/net/atm/br2684.c
b/net/atm/br2684.c
index
91a89d3
..
f7955e6
100644
(file)
--- a/
net/atm/br2684.c
+++ b/
net/atm/br2684.c
@@
-294,7
+294,7
@@
static inline unsigned short br_type_trans(struct sk_buff *skb,
{
struct ethhdr *eth;
unsigned char *rawp;
{
struct ethhdr *eth;
unsigned char *rawp;
- eth =
skb->mac.ethernet
;
+ eth =
eth_hdr(skb)
;
if (*eth->h_dest & 1) {
if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
if (*eth->h_dest & 1) {
if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0)
@@
-558,12
+558,12
@@
Note: we do not have explicit unassign, but look at _push()
atmvcc->push = br2684_push;
skb_queue_head_init(©);
skb_migrate(&atmvcc->sk->sk_receive_queue, ©);
atmvcc->push = br2684_push;
skb_queue_head_init(©);
skb_migrate(&atmvcc->sk->sk_receive_queue, ©);
- while ((skb = skb_dequeue(©))) {
+ while ((skb = skb_dequeue(©))
!= NULL
) {
BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
BRPRIV(skb->dev)->stats.rx_packets--;
br2684_push(atmvcc, skb);
}
BRPRIV(skb->dev)->stats.rx_bytes -= skb->len;
BRPRIV(skb->dev)->stats.rx_packets--;
br2684_push(atmvcc, skb);
}
-
(void) try
_module_get(THIS_MODULE);
+
_
_module_get(THIS_MODULE);
return 0;
error:
write_unlock_irq(&devs_lock);
return 0;
error:
write_unlock_irq(&devs_lock);