SOURCES: kernel-net-atl2-build.patch - make it proper way (and it'...

[zbyniu]

Author: zbyniu                       Date: Fri Aug 24 21:07:50 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- make it proper way (and it's for >= 2.6.21, not .19)

---- Files affected:
SOURCES:
   kernel-net-atl2-build.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-net-atl2-build.patch
diff -u SOURCES/kernel-net-atl2-build.patch:1.1 SOURCES/kernel-net-atl2-build.patch:1.2
--- SOURCES/kernel-net-atl2-build.patch:1.1	Fri Aug 24 10:02:06 2007
+++ SOURCES/kernel-net-atl2-build.patch	Fri Aug 24 23:07:44 2007
@@ -1,28 +1,35 @@
---- src/at_main.c.orig	2007-04-21 11:19:25.000000000 +0200
-+++ src/at_main.c	2007-08-24 09:33:55.122013719 +0200
-@@ -1479,7 +1479,7 @@
- static void
- at_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
- {
--    struct at_adapter *adapter = netdev_priv(netdev);
-+/*    struct at_adapter *adapter = netdev_priv(netdev);
- 
+         }
+diff -upr atl2-1.4.0.20./src/at_main.c atl2-1.4.0.20/src/at_main.c
+--- atl2-1.4.0.20./src/at_main.c	2007-04-21 11:19:25.000000000 +0200
++++ atl2-1.4.0.20/src/at_main.c	2007-08-24 22:49:28.682998750 +0200
+@@ -1484,9 +1484,12 @@ at_vlan_rx_kill_vid(struct net_device *n
  //    DEBUGFUNC("at_vlan_rx_kill_vid !");
      at_irq_disable(adapter);
-@@ -1499,7 +1500,7 @@
- at_restore_vlan(struct at_adapter *adapter)
- {
- //    DEBUGFUNC("at_restore_vlan !");
--    at_vlan_rx_register(adapter->netdev, adapter->vlgrp);
-+/*    at_vlan_rx_register(adapter->netdev, adapter->vlgrp);
  
+-    if (adapter->vlgrp) {
+-        adapter->vlgrp->vlan_devices[vid] = NULL;
+-    }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)  
++	if (adapter->vlgrp)
++		adapter->vlgrp->vlan_devices[vid] = NULL;
++#else
++	vlan_group_set_device(adapter->vlgrp, vid, NULL);
++#endif
+ 
+     at_irq_enable(adapter);
+ 
+@@ -1504,8 +1507,12 @@ at_restore_vlan(struct at_adapter *adapt
      if(adapter->vlgrp) {
          u16 vid;
-@@ -1509,6 +1510,7 @@
+         for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
+-            if(!adapter->vlgrp->vlan_devices[vid])
+-                continue;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)  
++		if(!adapter->vlgrp->vlan_devices[vid])
++#else
++		if(!adapter->vlgrp->vlan_devices_arrays[vid])
++#endif
++			continue;
              at_vlan_rx_add_vid(adapter->netdev, vid);
          }
      }
-+*/
- }
- #endif
- 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-net-atl2-build.patch?r1=1.1&r2=1.2&f=u