Changeset 18886 for src/linux/universal/linux-3.2/drivers/net/ethernet/ag71xx/ag71xx_ar7240.c

Timestamp:

04/01/12 04:18:18 (14 months ago)

Author:

BrainSlayer

Message:

fix switch driver bug (thx nbd)

File:

• src/linux/universal/linux-3.2/drivers/net/ethernet/ag71xx/ag71xx_ar7240.c (modified) (4 diffs)

src/linux/universal/linux-3.2/drivers/net/ethernet/ag71xx/ag71xx_ar7240.c

@@ -291 +291 @@
         u8 ver;
         bool vlan;
+        bool init;
         u16 vlan_id[AR7240_MAX_VLANS];
         u8 vlan_table[AR7240_MAX_VLANS];
@@ -864 +865 @@
 
         memset(portmask, 0, sizeof(portmask));
-        if (as->vlan) {
+        if (!as->init) {
                 /* calculate the port destination masks and load vlans
                  * into the vlan translation unit */
@@ -907 +908 @@
 {
         struct ar7240sw *as = sw_to_ar7240(dev);
+        as->init = false;
         ar7240sw_reset(as);
         return 0;
@@ -1095 +1097 @@
 
         as->vlan_table[0] = ar7240sw_port_mask_all(as);
+        as->init = true;
 
         return as;