projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
[powerpc.git]
/
net
/
atm
/
br2684.c
diff --git
a/net/atm/br2684.c
b/net/atm/br2684.c
index
72f3f7b
..
d00cca9
100644
(file)
--- a/
net/atm/br2684.c
+++ b/
net/atm/br2684.c
@@
-5,7
+5,6
@@
Author: Marcell GAL, 2000, XDSL Ltd, Hungary
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/list.h>
@@
-18,6
+17,7
@@
Author: Marcell GAL, 2000, XDSL Ltd, Hungary
#include <net/arp.h>
#include <linux/atm.h>
#include <linux/atmdev.h>
#include <net/arp.h>
#include <linux/atm.h>
#include <linux/atmdev.h>
+#include <linux/capability.h>
#include <linux/seq_file.h>
#include <linux/atmbr2684.h>
#include <linux/seq_file.h>
#include <linux/atmbr2684.h>
@@
-295,14
+295,14
@@
static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev)
unsigned char *rawp;
eth = eth_hdr(skb);
unsigned char *rawp;
eth = eth_hdr(skb);
- if (
*eth->h_dest & 1
) {
- if (
memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0
)
+ if (
is_multicast_ether_addr(eth->h_dest)
) {
+ if (
!compare_ether_addr(eth->h_dest, dev->broadcast)
)
skb->pkt_type = PACKET_BROADCAST;
else
skb->pkt_type = PACKET_MULTICAST;
}
skb->pkt_type = PACKET_BROADCAST;
else
skb->pkt_type = PACKET_MULTICAST;
}
- else if (
memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN
))
+ else if (
compare_ether_addr(eth->h_dest, dev->dev_addr
))
skb->pkt_type = PACKET_OTHERHOST;
if (ntohs(eth->h_proto) >= 1536)
skb->pkt_type = PACKET_OTHERHOST;
if (ntohs(eth->h_proto) >= 1536)
@@
-508,10
+508,9
@@
Note: we do not have explicit unassign, but look at _push()
if (copy_from_user(&be, arg, sizeof be))
return -EFAULT;
if (copy_from_user(&be, arg, sizeof be))
return -EFAULT;
- brvcc = k
m
alloc(sizeof(struct br2684_vcc), GFP_KERNEL);
+ brvcc = k
z
alloc(sizeof(struct br2684_vcc), GFP_KERNEL);
if (!brvcc)
return -ENOMEM;
if (!brvcc)
return -ENOMEM;
- memset(brvcc, 0, sizeof(struct br2684_vcc));
write_lock_irq(&devs_lock);
net_dev = br2684_find_dev(&be.ifspec);
if (net_dev == NULL) {
write_lock_irq(&devs_lock);
net_dev = br2684_find_dev(&be.ifspec);
if (net_dev == NULL) {