linux-2.1.99 PATCH to fix wanrouter symbols for modules

Adam J. Richter (adam@yggdrasil.com)
Sat, 2 May 1998 08:16:51 -0700

There are few symbols that have been changed in
linux/net/wanrouter/wanmain.c but were not updated in the corresponding
drivers in linux/drivers/net/sdla*.c. This patch updates the symbol
names.

Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 205
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."
-----------------------------CUT HERE--------------------------------
--- /tmp/linux-2.1.99/drivers/net/sdlamain.c Tue Feb 10 12:56:45 1998
+++ linux/drivers/net/sdlamain.c Sat May 2 06:09:09 1998
@@ -152,7 +152,7 @@
wandev->setup = &setup;
wandev->shutdown = &shutdown;
wandev->ioctl = &ioctl;
- err = register_wandev(wandev);
+ err = register_wan_device(wandev);
if (err)
{
printk(KERN_ERR
@@ -179,7 +179,7 @@
for (i = 0; i < ncards; ++i)
{
sdla_t* card = &card_array[i];
- unregister_wandev(card->devname);
+ unregister_wan_device(card->devname);
}
kfree(card_array);
}
--- /tmp/linux-2.1.99/drivers/net/sdla_fr.c Tue Apr 7 07:52:04 1998
+++ linux/drivers/net/sdla_fr.c Sat May 2 06:09:08 1998
@@ -831,7 +831,7 @@
{
int hdr_len = 0;
skb->protocol = type;
- hdr_len = wan_encapsulate(skb, dev);
+ hdr_len = wanrouter_encapsulate(skb, dev);
if (hdr_len < 0)
{
hdr_len = 0;
@@ -1486,7 +1486,7 @@
/* Decapsulate packet and pass it up the protocol stack */
skb->dev = dev;
buf = skb_pull(skb, 1); /* remove hardware header */
- if (!wan_type_trans(skb, dev))
+ if (!wanrouter_type_trans(skb, dev))
{
/* can't decapsulate packet */
dev_kfree_skb(skb);
@@ -1601,7 +1601,7 @@
skb->dev = dev;
/* remove hardware header */
buf = skb_pull(skb, 1);
- if (!wan_type_trans(skb, dev))
+ if (!wanrouter_type_trans(skb, dev))
{
/* can't decapsulate packet */
dev_kfree_skb(skb);
@@ -2746,7 +2746,7 @@
stack */
new_skb->dev = dev;
buf = skb_pull(new_skb, 1); /* remove hardware header */
- if (!wan_type_trans(new_skb, dev))
+ if (!wanrouter_type_trans(new_skb, dev))
{
++chan->UDP_FPIPE_mgmt_not_passed_to_stack;
/* can't decapsulate packet */
@@ -2944,7 +2944,7 @@
new_skb->dev = dev;
/* remove hardware header */
buf = skb_pull(new_skb, 1);
- if (!wan_type_trans(new_skb, dev))
+ if (!wanrouter_type_trans(new_skb, dev))
{
/* can't decapsulate packet */
++chan->UDP_DRVSTATS_mgmt_not_passed_to_stack;
--- /tmp/linux-2.1.99/drivers/net/sdla_x25.c Tue Apr 7 07:52:04 1998
+++ linux/drivers/net/sdla_x25.c Sat May 2 06:09:08 1998
@@ -649,7 +649,7 @@
skb->protocol = type;
if (!chan->protocol)
{
- hdr_len = wan_encapsulate(skb, dev);
+ hdr_len = wanrouter_encapsulate(skb, dev);
if (hdr_len < 0)
{
hdr_len = 0;
@@ -999,7 +999,7 @@
chan->rx_skb = NULL; /* dequeue packet */

/* Decapsulate packet, if necessary */
- if (!skb->protocol && !wan_type_trans(skb, dev))
+ if (!skb->protocol && !wanrouter_type_trans(skb, dev))
{
/* can't decapsulate packet */
dev_kfree_skb(skb);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu