diff options
| author | Roland McGrath <roland@gnu.org> | 2000-02-05 12:16:04 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-02-05 12:16:04 +0000 |
| commit | a60df9686250648ac13f559e98ebdc1422146494 (patch) | |
| tree | d103d988f5b82927ec66d3546ce81d262a3b2ffd /pfinet/linux-src/net/ipv4 | |
| parent | 1a7ccb577c414677f9e763036d6ccce3a298f16d (diff) | |
Merge Linux_2_2_12 -> Linux_2_2_13 changes
Diffstat (limited to 'pfinet/linux-src/net/ipv4')
| -rw-r--r-- | pfinet/linux-src/net/ipv4/arp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv4/arp.c b/pfinet/linux-src/net/ipv4/arp.c index 045513a8..508142d4 100644 --- a/pfinet/linux-src/net/ipv4/arp.c +++ b/pfinet/linux-src/net/ipv4/arp.c @@ -194,9 +194,14 @@ int arp_mc_map(u32 addr, u8 *haddr, struct device *dev, int dir) { switch (dev->type) { case ARPHRD_ETHER: - case ARPHRD_IEEE802: case ARPHRD_FDDI: - ip_eth_mc_map(addr, haddr); + ip_eth_mc_map(addr, haddr) ; + return 0 ; + case ARPHRD_IEEE802: + if ( (dev->name[0] == 't') && (dev->name[1] == 'r')) /* Token Ring */ + ip_tr_mc_map(addr,haddr) ; + else + ip_eth_mc_map(addr, haddr); return 0; default: if (dir) { |