patch-2.3.99-pre3 linux/net/atm/mpc.c

• Lines: 36
• Date: Tue Mar 21 23:38:26 2000
• Orig file: v2.3.99-pre2/linux/net/atm/mpc.c
• Orig date: Thu Feb 10 17:11:23 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/net/atm/mpc.c linux/net/atm/mpc.c
@@ -2,6 +2,7 @@
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 /* We are an ethernet device */
 #include <linux/if_ether.h>
@@ -522,7 +523,7 @@
         atomic_add(skb->truesize, &entry->shortcut->tx_inuse);
 	ATM_SKB(skb)->iovcnt = 0; /* just to be safe ... */
 	ATM_SKB(skb)->atm_options = entry->shortcut->atm_options;
-        entry->shortcut->dev->ops->send(entry->shortcut, skb);
+        entry->shortcut->send(entry->shortcut, skb);
 	entry->packets_fwded++;
 
         return 0;
@@ -739,7 +740,7 @@
         NULL,           /* last VCC             */
         NULL,           /* per-device data      */
         NULL,           /* private PHY data     */
-        0,              /* device flags         */
+        { 0 },          /* device flags         */
         NULL,           /* local ATM address    */
         { 0 }           /* no ESI               */
         /* rest of the members will be 0 */
@@ -780,7 +781,8 @@
 
         mpc->mpoad_vcc = vcc;
         bind_vcc(vcc, &mpc_dev);
-        vcc->flags |= ATM_VF_READY | ATM_VF_META;
+	set_bit(ATM_VF_META,&vcc->flags);
+	set_bit(ATM_VF_READY,&vcc->flags);
 
         if (mpc->dev) {
                 char empty[ATM_ESA_LEN];