net_alias_dev_rcv_sel32 in pre-2.0.31-5

Michael Reinelt (mreinelt@sime.com)
Wed, 13 Aug 1997 08:47:49 +0200

This function has been renamed to net_alias_dev_rx32, but was not
corrected in two files. Here's my micro-patch:

--- linux/net/ipv4/arp.c.old Wed Aug 13 08:41:30 1997
+++ linux/net/ipv4/arp.c Wed Aug 13 08:42:00 1997
@@ -1920,9 +1920,9 @@
if (tip != dev->pa_addr && net_alias_has(skb->dev))
{
/*
- * net_alias_dev_rcv_sel32 returns main dev if it fails to found other.
+ * net_alias_dev_rx32 returns main dev if it fails to found other.
*/
- dev = net_alias_dev_rcv_sel32(dev, AF_INET, sip, tip);
+ dev = net_alias_dev_rx32(dev, AF_INET, sip, tip);

if (dev->type != ntohs(arp->ar_hrd) || dev->flags & IFF_NOARP)
{
--- linux/net/ipv4/ip_input.c.old Wed Aug 13 08:41:42 1997
+++ linux/net/ipv4/ip_input.c Wed Aug 13 08:42:09 1997
@@ -297,13 +297,13 @@

/*
* Try to select closest <src,dst> alias device, if any.
- * net_alias_dev_rcv_sel32 returns main device if it
+ * net_alias_dev_rx32 returns main device if it
* fails to found other.
*/

#ifdef CONFIG_NET_ALIAS
if (iph->daddr != skb->dev->pa_addr && net_alias_has(skb->dev)) {
- skb->dev = dev = net_alias_dev_rcv_sel32(skb->dev, AF_INET, iph->saddr, iph->daddr);
+ skb->dev = dev = net_alias_dev_rx32(skb->dev, AF_INET, iph->saddr, iph->daddr);
}
#endif


-- 
Michael Reinelt					   vox: +43 316 577288
Algersdorferstr. 66a				   fax: +43 316 577852
A-8020 Graz, Austria			      email: mreinelt@sime.com