Commit a5ea51da authored by David S. Miller's avatar David S. Miller

Merge master.kernel.org:/home/acme/BK/newdatalink-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 7e73d6ff b4878edb
...@@ -181,7 +181,7 @@ struct cops_local ...@@ -181,7 +181,7 @@ struct cops_local
int board; /* Holds what board type is. */ int board; /* Holds what board type is. */
int nodeid; /* Set to 1 once have nodeid. */ int nodeid; /* Set to 1 once have nodeid. */
unsigned char node_acquire; /* Node ID when acquired. */ 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. */ /* Index to functions, as function prototypes. */
...@@ -955,8 +955,8 @@ static int cops_hard_header(struct sk_buff *skb, struct net_device *dev, ...@@ -955,8 +955,8 @@ static int cops_hard_header(struct sk_buff *skb, struct net_device *dev,
static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct cops_local *lp = (struct cops_local *)dev->priv; struct cops_local *lp = (struct cops_local *)dev->priv;
struct sockaddr_at *sa=(struct sockaddr_at *)&ifr->ifr_addr; 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) switch(cmd)
{ {
......
...@@ -116,7 +116,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -116,7 +116,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
u32 paddr = ((struct rtable*)skb->dst)->rt_gateway; u32 paddr = ((struct rtable*)skb->dst)->rt_gateway;
struct ddpehdr *ddp; struct ddpehdr *ddp;
struct ipddp_route *rt; struct ipddp_route *rt;
struct at_addr *our_addr; struct atalk_addr *our_addr;
/* /*
* Find appropriate route to use, based only on IP number. * Find appropriate route to use, based only on IP number.
......
...@@ -15,7 +15,7 @@ struct ipddp_route ...@@ -15,7 +15,7 @@ struct ipddp_route
{ {
struct net_device *dev; /* Carrier device */ struct net_device *dev; /* Carrier device */
__u32 ip; /* IP address */ __u32 ip; /* IP address */
struct at_addr at; /* Gateway appletalk address */ struct atalk_addr at; /* Gateway appletalk address */
int flags; int flags;
struct ipddp_route *next; struct ipddp_route *next;
}; };
......
...@@ -262,7 +262,7 @@ static unsigned char *ltdmacbuf; ...@@ -262,7 +262,7 @@ static unsigned char *ltdmacbuf;
struct ltpc_private struct ltpc_private
{ {
struct net_device_stats stats; struct net_device_stats stats;
struct at_addr my_addr; struct atalk_addr my_addr;
}; };
/* transmit queue element struct */ /* transmit queue element struct */
...@@ -826,7 +826,7 @@ static int ltpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -826,7 +826,7 @@ static int ltpc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr; struct sockaddr_at *sa = (struct sockaddr_at *) &ifr->ifr_addr;
/* we'll keep the localtalk node address in dev->pa_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; struct lt_init c;
int ltflags; int ltflags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment