diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:24:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:24:28 -0500 |
| commit | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (patch) | |
| tree | 0a1bc8ff40c12bb30066467e11ae9153f89514e7 /net/atm/br2684.c | |
| parent | 57d1c91fa6d9146b309b7511f6432dea2a24858b (diff) | |
| parent | a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm/br2684.c')
| -rw-r--r-- | net/atm/br2684.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 72f3f7b8de80..bdb4d89730d2 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
| @@ -295,7 +295,7 @@ static inline __be16 br_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
| 295 | unsigned char *rawp; | 295 | unsigned char *rawp; |
| 296 | eth = eth_hdr(skb); | 296 | eth = eth_hdr(skb); |
| 297 | 297 | ||
| 298 | if (*eth->h_dest & 1) { | 298 | if (is_multicast_ether_addr(eth->h_dest)) { |
| 299 | if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) | 299 | if (memcmp(eth->h_dest, dev->broadcast, ETH_ALEN) == 0) |
| 300 | skb->pkt_type = PACKET_BROADCAST; | 300 | skb->pkt_type = PACKET_BROADCAST; |
| 301 | else | 301 | else |