clean up reading of ICR register in FEC driver
[linux-2.6.git] / net / 8021q / vlan_dev.c
index 145f5cd..4d2aa4d 100644 (file)
@@ -5,14 +5,14 @@
  * Authors:    Ben Greear <greearb@candelatech.com>
  *              Please send support related email to: vlan@scry.wanfear.com
  *              VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
- * 
+ *
  * Fixes:       Mar 22 2001: Martin Bokaemper <mbokaemper@unispherenetworks.com>
  *                - reset skb->pkt_type on incoming packets when MAC was changed
  *                - see that changed MAC is saddr for outgoing packets
  *              Oct 20, 2001:  Ard van Breeman:
  *                - Fix MC-list, finally.
  *                - Flush MC-list on VLAN destroy.
- *                
+ *
  *
  *             This program is free software; you can redistribute it and/or
  *             modify it under the terms of the GNU General Public License
@@ -58,22 +58,22 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
 
                /* TODO:  Confirm this will work with VLAN headers... */
                return arp_find(veth->h_dest, skb);
-#endif 
+#endif
        default:
                printk(VLAN_DBG
-                      "%s: unable to resolve type %X addresses.\n", 
-                      dev->name, (int)veth->h_vlan_encapsulated_proto);
-        
+                      "%s: unable to resolve type %X addresses.\n",
+                      dev->name, ntohs(veth->h_vlan_encapsulated_proto));
+
                memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
                break;
-       };
+       }
 
        return 0;
 }
 
 static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
 {
-       if (VLAN_DEV_INFO(skb->dev)->flags & 1) {
+       if (VLAN_DEV_INFO(skb->dev)->flags & VLAN_FLAG_REORDER_HDR) {
                if (skb_shared(skb) || skb_cloned(skb)) {
                        struct sk_buff *nskb = skb_copy(skb, GFP_ATOMIC);
                        kfree_skb(skb);
@@ -83,7 +83,7 @@ static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
                        /* Lifted from Gleb's VLAN code... */
                        memmove(skb->data - ETH_HLEN,
                                skb->data - VLAN_ETH_HLEN, 12);
-                       skb->mac.raw += VLAN_HLEN;
+                       skb->mac_header += VLAN_HLEN;
                }
        }
 
@@ -91,7 +91,7 @@ static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
 }
 
 /*
- *     Determine the packet's protocol ID. The rule here is that we 
+ *     Determine the packet's protocol ID. The rule here is that we
  *     assume 802.3 if the type field is short enough to be a length.
  *     This is normal practice and works for any 'now in use' protocol.
  *
@@ -113,14 +113,14 @@ static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
  *
  */
 int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
-                  struct packet_type* ptype, struct net_device *orig_dev)
+                 struct packet_type* ptype, struct net_device *orig_dev)
 {
        unsigned char *rawp = NULL;
        struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data);
        unsigned short vid;
        struct net_device_stats *stats;
        unsigned short vlan_TCI;
-       unsigned short proto;
+       __be16 proto;
 
        /* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */
        vlan_TCI = ntohs(vhdr->h_vlan_TCI);
@@ -163,7 +163,8 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
        stats->rx_packets++;
        stats->rx_bytes += skb->len;
 
-       skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */
+       /* Take off the VLAN header (4 bytes currently) */
+       skb_pull_rcsum(skb, VLAN_HLEN);
 
        /* Ok, lets check to make sure the device (dev) we
         * came in on is what this VLAN is attached to.
@@ -174,8 +175,8 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
 #ifdef VLAN_DEBUG
                printk(VLAN_DBG "%s: dropping skb: %p because came in on wrong device, dev: %s  real_dev: %s, skb_dev: %s\n",
-                       __FUNCTION__, skb, dev->name, 
-                       VLAN_DEV_INFO(skb->dev)->real_dev->name, 
+                       __FUNCTION__, skb, dev->name,
+                       VLAN_DEV_INFO(skb->dev)->real_dev->name,
                        skb->dev->name);
 #endif
                kfree_skb(skb);
@@ -190,7 +191,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
 #ifdef VLAN_DEBUG
        printk(VLAN_DBG "%s: priority: %lu  for TCI: %hu (hbo)\n",
-               __FUNCTION__, (unsigned long)(skb->priority), 
+               __FUNCTION__, (unsigned long)(skb->priority),
                ntohs(vhdr->h_vlan_TCI));
 #endif
 
@@ -206,19 +207,19 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                stats->multicast++;
                break;
 
-       case PACKET_OTHERHOST: 
+       case PACKET_OTHERHOST:
                /* Our lower layer thinks this is not local, let's make sure.
                 * This allows the VLAN to have a different MAC than the underlying
                 * device, and still route correctly.
                 */
-               if (memcmp(eth_hdr(skb)->h_dest, skb->dev->dev_addr, ETH_ALEN) == 0) {
+               if (!compare_ether_addr(eth_hdr(skb)->h_dest, skb->dev->dev_addr)) {
                        /* It is for our (changed) MAC-address! */
                        skb->pkt_type = PACKET_HOST;
                }
                break;
        default:
                break;
-       };
+       }
 
        /*  Was a VLAN packet, grab the encapsulated protocol, which the layer
         * three protocols care about.
@@ -257,7 +258,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
         * won't work for fault tolerant netware but does for the rest.
         */
        if (*(unsigned short *)rawp == 0xFFFF) {
-               skb->protocol = __constant_htons(ETH_P_802_3);
+               skb->protocol = htons(ETH_P_802_3);
                /* place it back on the queue to be handled by true layer 3 protocols.
                 */
 
@@ -280,7 +281,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
        /*
         *      Real 802.2 LLC
         */
-       skb->protocol = __constant_htons(ETH_P_802_2);
+       skb->protocol = htons(ETH_P_802_2);
        /* place it back on the queue to be handled by upper layer protocols.
         */
 
@@ -318,7 +319,7 @@ static inline unsigned short vlan_dev_get_egress_qos_mask(struct net_device* dev
 }
 
 /*
- *     Create the VLAN header for an arbitrary protocol layer 
+ *     Create the VLAN header for an arbitrary protocol layer
  *
  *     saddr=NULL      means use device source address
  *     daddr=NULL      means leave destination address (eg unresolved arp)
@@ -327,8 +328,8 @@ static inline unsigned short vlan_dev_get_egress_qos_mask(struct net_device* dev
  *  physical devices.
  */
 int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
-                         unsigned short type, void *daddr, void *saddr,
-                         unsigned len)
+                        unsigned short type, void *daddr, void *saddr,
+                        unsigned len)
 {
        struct vlan_hdr *vhdr;
        unsigned short veth_TCI = 0;
@@ -345,11 +346,12 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
         * fixes some programs that get confused when they see a VLAN device
         * sending a frame that is VLAN encoded (the consensus is that the VLAN
         * device should look completely like an Ethernet device when the
-        * REORDER_HEADER flag is set)  The drawback to this is some extra 
+        * REORDER_HEADER flag is set)  The drawback to this is some extra
         * header shuffling in the hard_start_xmit.  Users can turn off this
         * REORDER behaviour with the vconfig tool.
         */
-       build_vlan_header = ((VLAN_DEV_INFO(dev)->flags & 1) == 0);
+       if (!(VLAN_DEV_INFO(dev)->flags & VLAN_FLAG_REORDER_HDR))
+               build_vlan_header = 1;
 
        if (build_vlan_header) {
                vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);
@@ -379,6 +381,9 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
                } else {
                        vhdr->h_vlan_encapsulated_proto = htons(len);
                }
+
+               skb->protocol = htons(ETH_P_8021Q);
+               skb_reset_network_header(skb);
        }
 
        /* Before delegating work to the lower layer, enter our MAC-address */
@@ -444,7 +449,7 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
         * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
         */
 
-       if (veth->h_vlan_proto != __constant_htons(ETH_P_8021Q)) {
+       if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {
                int orig_headroom = skb_headroom(skb);
                unsigned short veth_TCI;
 
@@ -530,269 +535,120 @@ int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
        return 0;
 }
 
-int vlan_dev_set_ingress_priority(char *dev_name, __u32 skb_prio, short vlan_prio)
+void vlan_dev_set_ingress_priority(const struct net_device *dev,
+                                  u32 skb_prio, short vlan_prio)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
+       struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
 
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       /* see if a priority mapping exists.. */
-                       VLAN_DEV_INFO(dev)->ingress_priority_map[vlan_prio & 0x7] = skb_prio;
-                       dev_put(dev);
-                       return 0;
-               }
+       if (vlan->ingress_priority_map[vlan_prio & 0x7] && !skb_prio)
+               vlan->nr_ingress_mappings--;
+       else if (!vlan->ingress_priority_map[vlan_prio & 0x7] && skb_prio)
+               vlan->nr_ingress_mappings++;
 
-               dev_put(dev);
-       }
-       return -EINVAL;
+       vlan->ingress_priority_map[vlan_prio & 0x7] = skb_prio;
 }
 
-int vlan_dev_set_egress_priority(char *dev_name, __u32 skb_prio, short vlan_prio)
+int vlan_dev_set_egress_priority(const struct net_device *dev,
+                                u32 skb_prio, short vlan_prio)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
+       struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
        struct vlan_priority_tci_mapping *mp = NULL;
        struct vlan_priority_tci_mapping *np;
-   
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       /* See if a priority mapping exists.. */
-                       mp = VLAN_DEV_INFO(dev)->egress_priority_map[skb_prio & 0xF];
-                       while (mp) {
-                               if (mp->priority == skb_prio) {
-                                       mp->vlan_qos = ((vlan_prio << 13) & 0xE000);
-                                       dev_put(dev);
-                                       return 0;
-                               }
-                               mp = mp->next;
-                       }
-
-                       /* Create a new mapping then. */
-                       mp = VLAN_DEV_INFO(dev)->egress_priority_map[skb_prio & 0xF];
-                       np = kmalloc(sizeof(struct vlan_priority_tci_mapping), GFP_KERNEL);
-                       if (np) {
-                               np->next = mp;
-                               np->priority = skb_prio;
-                               np->vlan_qos = ((vlan_prio << 13) & 0xE000);
-                               VLAN_DEV_INFO(dev)->egress_priority_map[skb_prio & 0xF] = np;
-                               dev_put(dev);
-                               return 0;
-                       } else {
-                               dev_put(dev);
-                               return -ENOBUFS;
-                       }
-               }
-               dev_put(dev);
-       }
-       return -EINVAL;
-}
+       u32 vlan_qos = (vlan_prio << 13) & 0xE000;
 
-/* Flags are defined in the vlan_dev_info class in include/linux/if_vlan.h file. */
-int vlan_dev_set_vlan_flag(char *dev_name, __u32 flag, short flag_val)
-{
-       struct net_device *dev = dev_get_by_name(dev_name);
-
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       /* verify flag is supported */
-                       if (flag == 1) {
-                               if (flag_val) {
-                                       VLAN_DEV_INFO(dev)->flags |= 1;
-                               } else {
-                                       VLAN_DEV_INFO(dev)->flags &= ~1;
-                               }
-                               dev_put(dev);
-                               return 0;
-                       } else {
-                               printk(KERN_ERR  "%s: flag %i is not valid.\n",
-                                       __FUNCTION__, (int)(flag));
-                               dev_put(dev);
-                               return -EINVAL;
-                       }
-               } else {
-                       printk(KERN_ERR 
-                              "%s: %s is not a vlan device, priv_flags: %hX.\n",
-                              __FUNCTION__, dev->name, dev->priv_flags);
-                       dev_put(dev);
+       /* See if a priority mapping exists.. */
+       mp = vlan->egress_priority_map[skb_prio & 0xF];
+       while (mp) {
+               if (mp->priority == skb_prio) {
+                       if (mp->vlan_qos && !vlan_qos)
+                               vlan->nr_egress_mappings--;
+                       else if (!mp->vlan_qos && vlan_qos)
+                               vlan->nr_egress_mappings++;
+                       mp->vlan_qos = vlan_qos;
+                       return 0;
                }
-       } else {
-               printk(KERN_ERR  "%s: Could not find device: %s\n", 
-                       __FUNCTION__, dev_name);
+               mp = mp->next;
        }
 
-       return -EINVAL;
-}
-
-
-int vlan_dev_get_realdev_name(const char *dev_name, char* result)
-{
-       struct net_device *dev = dev_get_by_name(dev_name);
-       int rv = 0;
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       strncpy(result, VLAN_DEV_INFO(dev)->real_dev->name, 23);
-                       rv = 0;
-               } else {
-                       rv = -EINVAL;
-               }
-               dev_put(dev);
-       } else {
-               rv = -ENODEV;
-       }
-       return rv;
+       /* Create a new mapping then. */
+       mp = vlan->egress_priority_map[skb_prio & 0xF];
+       np = kmalloc(sizeof(struct vlan_priority_tci_mapping), GFP_KERNEL);
+       if (!np)
+               return -ENOBUFS;
+
+       np->next = mp;
+       np->priority = skb_prio;
+       np->vlan_qos = vlan_qos;
+       vlan->egress_priority_map[skb_prio & 0xF] = np;
+       if (vlan_qos)
+               vlan->nr_egress_mappings++;
+       return 0;
 }
 
-int vlan_dev_get_vid(const char *dev_name, unsigned short* result)
+/* Flags are defined in the vlan_flags enum in include/linux/if_vlan.h file. */
+int vlan_dev_set_vlan_flag(const struct net_device *dev,
+                          u32 flag, short flag_val)
 {
-       struct net_device *dev = dev_get_by_name(dev_name);
-       int rv = 0;
-       if (dev) {
-               if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                       *result = VLAN_DEV_INFO(dev)->vlan_id;
-                       rv = 0;
+       /* verify flag is supported */
+       if (flag == VLAN_FLAG_REORDER_HDR) {
+               if (flag_val) {
+                       VLAN_DEV_INFO(dev)->flags |= VLAN_FLAG_REORDER_HDR;
                } else {
-                       rv = -EINVAL;
+                       VLAN_DEV_INFO(dev)->flags &= ~VLAN_FLAG_REORDER_HDR;
                }
-               dev_put(dev);
-       } else {
-               rv = -ENODEV;
+               return 0;
        }
-       return rv;
+       printk(KERN_ERR "%s: flag %i is not valid.\n", __FUNCTION__, flag);
+       return -EINVAL;
 }
 
-
-int vlan_dev_set_mac_address(struct net_device *dev, void *addr_struct_p)
+void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)
 {
-       struct sockaddr *addr = (struct sockaddr *)(addr_struct_p);
-       int i;
-
-       if (netif_running(dev))
-               return -EBUSY;
-
-       memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-
-       printk("%s: Setting MAC address to ", dev->name);
-       for (i = 0; i < 6; i++)
-               printk(" %2.2x", dev->dev_addr[i]);
-       printk(".\n");
-
-       if (memcmp(VLAN_DEV_INFO(dev)->real_dev->dev_addr,
-                  dev->dev_addr,
-                  dev->addr_len) != 0) {
-               if (!(VLAN_DEV_INFO(dev)->real_dev->flags & IFF_PROMISC)) {
-                       int flgs = VLAN_DEV_INFO(dev)->real_dev->flags;
-
-                       /* Increment our in-use promiscuity counter */
-                       dev_set_promiscuity(VLAN_DEV_INFO(dev)->real_dev, 1);
-
-                       /* Make PROMISC visible to the user. */
-                       flgs |= IFF_PROMISC;
-                       printk("VLAN (%s):  Setting underlying device (%s) to promiscious mode.\n",
-                              dev->name, VLAN_DEV_INFO(dev)->real_dev->name);
-                       dev_change_flags(VLAN_DEV_INFO(dev)->real_dev, flgs);
-               }
-       } else {
-               printk("VLAN (%s):  Underlying device (%s) has same MAC, not checking promiscious mode.\n",
-                      dev->name, VLAN_DEV_INFO(dev)->real_dev->name);
-       }
-
-       return 0;
+       strncpy(result, VLAN_DEV_INFO(dev)->real_dev->name, 23);
 }
 
-static inline int vlan_dmi_equals(struct dev_mc_list *dmi1,
-                                  struct dev_mc_list *dmi2)
+void vlan_dev_get_vid(const struct net_device *dev, unsigned short *result)
 {
-       return ((dmi1->dmi_addrlen == dmi2->dmi_addrlen) &&
-               (memcmp(dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) == 0));
+       *result = VLAN_DEV_INFO(dev)->vlan_id;
 }
 
-/** dmi is a single entry into a dev_mc_list, a single node.  mc_list is
- *  an entire list, and we'll iterate through it.
- */
-static int vlan_should_add_mc(struct dev_mc_list *dmi, struct dev_mc_list *mc_list)
+int vlan_dev_open(struct net_device *dev)
 {
-       struct dev_mc_list *idmi;
-
-       for (idmi = mc_list; idmi != NULL; ) {
-               if (vlan_dmi_equals(dmi, idmi)) {
-                       if (dmi->dmi_users > idmi->dmi_users)
-                               return 1;
-                       else
-                               return 0;
-               } else {
-                       idmi = idmi->next;
-               }
-       }
-
-       return 1;
-}
+       struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);
+       struct net_device *real_dev = vlan->real_dev;
+       int err;
 
-static inline void vlan_destroy_mc_list(struct dev_mc_list *mc_list)
-{
-       struct dev_mc_list *dmi = mc_list;
-       struct dev_mc_list *next;
+       if (!(real_dev->flags & IFF_UP))
+               return -ENETDOWN;
 
-       while(dmi) {
-               next = dmi->next;
-               kfree(dmi);
-               dmi = next;
+       if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) {
+               err = dev_unicast_add(real_dev, dev->dev_addr, ETH_ALEN);
+               if (err < 0)
+                       return err;
        }
-}
-
-static void vlan_copy_mc_list(struct dev_mc_list *mc_list, struct vlan_dev_info *vlan_info)
-{
-       struct dev_mc_list *dmi, *new_dmi;
+       memcpy(vlan->real_dev_addr, real_dev->dev_addr, ETH_ALEN);
 
-       vlan_destroy_mc_list(vlan_info->old_mc_list);
-       vlan_info->old_mc_list = NULL;
+       if (dev->flags & IFF_ALLMULTI)
+               dev_set_allmulti(real_dev, 1);
+       if (dev->flags & IFF_PROMISC)
+               dev_set_promiscuity(real_dev, 1);
 
-       for (dmi = mc_list; dmi != NULL; dmi = dmi->next) {
-               new_dmi = kmalloc(sizeof(*new_dmi), GFP_ATOMIC);
-               if (new_dmi == NULL) {
-                       printk(KERN_ERR "vlan: cannot allocate memory. "
-                              "Multicast may not work properly from now.\n");
-                       return;
-               }
-
-               /* Copy whole structure, then make new 'next' pointer */
-               *new_dmi = *dmi;
-               new_dmi->next = vlan_info->old_mc_list;
-               vlan_info->old_mc_list = new_dmi;
-       }
+       return 0;
 }
 
-static void vlan_flush_mc_list(struct net_device *dev)
+int vlan_dev_stop(struct net_device *dev)
 {
-       struct dev_mc_list *dmi = dev->mc_list;
-
-       while (dmi) {
-               printk(KERN_DEBUG "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from vlan interface\n",
-                      dev->name,
-                      dmi->dmi_addr[0],
-                      dmi->dmi_addr[1],
-                      dmi->dmi_addr[2],
-                      dmi->dmi_addr[3],
-                      dmi->dmi_addr[4],
-                      dmi->dmi_addr[5]);
-               dev_mc_delete(dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-               dmi = dev->mc_list;
-       }
-
-       /* dev->mc_list is NULL by the time we get here. */
-       vlan_destroy_mc_list(VLAN_DEV_INFO(dev)->old_mc_list);
-       VLAN_DEV_INFO(dev)->old_mc_list = NULL;
-}
+       struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev;
 
-int vlan_dev_open(struct net_device *dev)
-{
-       if (!(VLAN_DEV_INFO(dev)->real_dev->flags & IFF_UP))
-               return -ENETDOWN;
+       dev_mc_unsync(real_dev, dev);
+       if (dev->flags & IFF_ALLMULTI)
+               dev_set_allmulti(real_dev, -1);
+       if (dev->flags & IFF_PROMISC)
+               dev_set_promiscuity(real_dev, -1);
 
-       return 0;
-}
+       if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
+               dev_unicast_delete(real_dev, dev->dev_addr, dev->addr_len);
 
-int vlan_dev_stop(struct net_device *dev)
-{
-       vlan_flush_mc_list(dev);
        return 0;
 }
 
@@ -809,7 +665,7 @@ int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        case SIOCGMIIPHY:
        case SIOCGMIIREG:
        case SIOCSMIIREG:
-               if (real_dev->do_ioctl && netif_device_present(real_dev)) 
+               if (real_dev->do_ioctl && netif_device_present(real_dev))
                        err = real_dev->do_ioctl(real_dev, &ifrr, cmd);
                break;
 
@@ -817,74 +673,24 @@ int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                err = dev_ethtool(&ifrr);
        }
 
-       if (!err) 
+       if (!err)
                ifr->ifr_ifru = ifrr.ifr_ifru;
 
        return err;
 }
 
-/** Taken from Gleb + Lennert's VLAN code, and modified... */
-void vlan_dev_set_multicast_list(struct net_device *vlan_dev)
+void vlan_change_rx_flags(struct net_device *dev, int change)
 {
-       struct dev_mc_list *dmi;
-       struct net_device *real_dev;
-       int inc;
-
-       if (vlan_dev && (vlan_dev->priv_flags & IFF_802_1Q_VLAN)) {
-               /* Then it's a real vlan device, as far as we can tell.. */
-               real_dev = VLAN_DEV_INFO(vlan_dev)->real_dev;
-
-               /* compare the current promiscuity to the last promisc we had.. */
-               inc = vlan_dev->promiscuity - VLAN_DEV_INFO(vlan_dev)->old_promiscuity;
-               if (inc) {
-                       printk(KERN_INFO "%s: dev_set_promiscuity(master, %d)\n",
-                              vlan_dev->name, inc);
-                       dev_set_promiscuity(real_dev, inc); /* found in dev.c */
-                       VLAN_DEV_INFO(vlan_dev)->old_promiscuity = vlan_dev->promiscuity;
-               }
-
-               inc = vlan_dev->allmulti - VLAN_DEV_INFO(vlan_dev)->old_allmulti;
-               if (inc) {
-                       printk(KERN_INFO "%s: dev_set_allmulti(master, %d)\n",
-                              vlan_dev->name, inc);
-                       dev_set_allmulti(real_dev, inc); /* dev.c */
-                       VLAN_DEV_INFO(vlan_dev)->old_allmulti = vlan_dev->allmulti;
-               }
-
-               /* looking for addresses to add to master's list */
-               for (dmi = vlan_dev->mc_list; dmi != NULL; dmi = dmi->next) {
-                       if (vlan_should_add_mc(dmi, VLAN_DEV_INFO(vlan_dev)->old_mc_list)) {
-                               dev_mc_add(real_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-                               printk(KERN_DEBUG "%s: add %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address to master interface\n",
-                                      vlan_dev->name,
-                                      dmi->dmi_addr[0],
-                                      dmi->dmi_addr[1],
-                                      dmi->dmi_addr[2],
-                                      dmi->dmi_addr[3],
-                                      dmi->dmi_addr[4],
-                                      dmi->dmi_addr[5]);
-                       }
-               }
+       struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev;
 
-               /* looking for addresses to delete from master's list */
-               for (dmi = VLAN_DEV_INFO(vlan_dev)->old_mc_list; dmi != NULL; dmi = dmi->next) {
-                       if (vlan_should_add_mc(dmi, vlan_dev->mc_list)) {
-                               /* if we think we should add it to the new list, then we should really
-                                * delete it from the real list on the underlying device.
-                                */
-                               dev_mc_delete(real_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
-                               printk(KERN_DEBUG "%s: del %.2x:%.2x:%.2x:%.2x:%.2x:%.2x mcast address from master interface\n",
-                                      vlan_dev->name,
-                                      dmi->dmi_addr[0],
-                                      dmi->dmi_addr[1],
-                                      dmi->dmi_addr[2],
-                                      dmi->dmi_addr[3],
-                                      dmi->dmi_addr[4],
-                                      dmi->dmi_addr[5]);
-                       }
-               }
+       if (change & IFF_ALLMULTI)
+               dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1);
+       if (change & IFF_PROMISC)
+               dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1);
+}
 
-               /* save multicast list */
-               vlan_copy_mc_list(vlan_dev->mc_list, VLAN_DEV_INFO(vlan_dev));
-       }
+/** Taken from Gleb + Lennert's VLAN code, and modified... */
+void vlan_dev_set_multicast_list(struct net_device *vlan_dev)
+{
+       dev_mc_sync(VLAN_DEV_INFO(vlan_dev)->real_dev, vlan_dev);
 }