Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Sun, 11 Aug 2002 07:40:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Sun, 11 Aug 2002 07:40:33 -0400 Received: from hermes.fachschaften.tu-muenchen.de ([129.187.202.12]:49621 "HELO hermes.fachschaften.tu-muenchen.de") by vger.kernel.org with SMTP id ; Sun, 11 Aug 2002 07:40:32 -0400 Date: Sun, 11 Aug 2002 13:44:15 +0200 (CEST) From: Adrian Bunk X-X-Sender: bunk@mimas.fachschaften.tu-muenchen.de To: Linus Torvalds , Arnaldo Carvalho de Melo , cc: Kernel Mailing List Subject: Re: Linux 2.5.31 In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2936 Lines: 83 On Sat, 10 Aug 2002, Linus Torvalds wrote: >... > Arnaldo Carvalho de Melo : >... > o Appletalk: more cleanups and code reorganization >... The s/at_addr/atalk_addr/ in atalk.h broke the compilation of drivers/net/appletalk/*. The patch below fixes it. cu Adrian --- drivers/net/appletalk/cops.c.old 2002-08-11 13:32:53.000000000 +0200 +++ drivers/net/appletalk/cops.c 2002-08-11 13:33:32.000000000 +0200 @@ -181,7 +181,7 @@ int board; /* Holds what board type is. */ int nodeid; /* Set to 1 once have nodeid. */ unsigned char node_acquire; /* Node ID when acquired. */ - struct at_addr node_addr; /* Full node address */ + struct atalk_addr node_addr; /* Full node address */ }; /* Index to functions, as function prototypes. */ @@ -956,7 +956,7 @@ { struct cops_local *lp = (struct cops_local *)dev->priv; struct sockaddr_at *sa=(struct sockaddr_at *)&ifr->ifr_addr; - struct at_addr *aa=(struct at_addr *)&lp->node_addr; + struct atalk_addr *aa=(struct atalk_addr *)&lp->node_addr; switch(cmd) { --- drivers/net/appletalk/ipddp.c.old 2002-08-11 13:33:55.000000000 +0200 +++ drivers/net/appletalk/ipddp.c 2002-08-11 13:34:05.000000000 +0200 @@ -116,7 +116,7 @@ u32 paddr = ((struct rtable*)skb->dst)->rt_gateway; struct ddpehdr *ddp; struct ipddp_route *rt; - struct at_addr *our_addr; + struct atalk_addr *our_addr; /* * Find appropriate route to use, based only on IP number. --- drivers/net/appletalk/ipddp.h.old 2002-08-11 13:34:59.000000000 +0200 +++ drivers/net/appletalk/ipddp.h 2002-08-11 13:36:06.000000000 +0200 @@ -15,7 +15,7 @@ { struct net_device *dev; /* Carrier device */ __u32 ip; /* IP address */ - struct at_addr at; /* Gateway appletalk address */ + struct atalk_addr at; /* Gateway appletalk address */ int flags; struct ipddp_route *next; }; --- drivers/net/appletalk/ltpc.c.old 2002-08-11 13:36:16.000000000 +0200 +++ drivers/net/appletalk/ltpc.c 2002-08-11 13:36:36.000000000 +0200 @@ -262,7 +262,7 @@ struct ltpc_private { struct net_device_stats stats; - struct at_addr my_addr; + struct atalk_addr my_addr; }; /* transmit queue element struct */ @@ -826,7 +826,7 @@ { struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr; /* we'll keep the localtalk node address in dev->pa_addr */ - struct at_addr *aa = &((struct ltpc_private *)dev->priv)->my_addr; + struct atalk_addr *aa = &((struct ltpc_private *)dev->priv)->my_addr; struct lt_init c; int ltflags; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/