Attachment 257031 Details for Bug 249382 – Fix for kernel 2.6.23.1

[patch] Fix for kernel 2.6.23.1

linux-2.6.18-atl2-1.0.40.2-2.6.23.asp.patch (text/plain), 1.68 KB, created by Andy Shevchenko on 2007-11-13 16:36:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Shevchenko

Created: 2007-11-13 16:36:10 UTC

Size: 1.68 KB

patch

obsolete

>diff -ruN -p atl2-1.0.40.2.orig/src/at_ethtool.c atl2-1.0.40.2/src/at_ethtool.c
>--- a/drivers/net/atl2/at_ethtool.c	2007-11-12 18:53:41.000000000 +0200
>+++ b/drivers/net/atl2/at_ethtool.c	2007-11-12 19:46:38.000000000 +0200
>@@ -418,9 +418,6 @@ static struct ethtool_ops at_ethtool_ops
> #ifdef NETIF_F_TSO
> 	.get_tso                = ethtool_op_get_tso,
> #endif
>-#ifdef ETHTOOL_GPERMADDR
>-	.get_perm_addr          = ethtool_op_get_perm_addr,
>-#endif
> };
> 
> void at_set_ethtool_ops(struct net_device *netdev)
>diff -ruN -p atl2-1.0.40.2.orig/src/at_main.c atl2-1.0.40.2/src/at_main.c
>--- a/drivers/net/atl2/at_main.c	2007-11-12 18:53:41.000000000 +0200
>+++ b/drivers/net/atl2/at_main.c	2007-11-12 19:39:18.000000000 +0200
>@@ -1485,7 +1485,7 @@ at_vlan_rx_kill_vid(struct net_device *n
>     at_irq_disable(adapter);
> 
>     if (adapter->vlgrp) {
>-        adapter->vlgrp->vlan_devices[vid] = NULL;
>+        adapter->vlgrp->vlan_devices_arrays[vid] = NULL;
>     }
> 
>     at_irq_enable(adapter);
>@@ -1504,7 +1504,7 @@ at_restore_vlan(struct at_adapter *adapt
>     if(adapter->vlgrp) {
>         u16 vid;
>         for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) {
>-            if(!adapter->vlgrp->vlan_devices[vid])
>+            if(!adapter->vlgrp->vlan_devices_arrays[vid])
>                 continue;
>             at_vlan_rx_add_vid(adapter->netdev, vid);
>         }
>@@ -2160,10 +2160,7 @@ at_intr_rx(struct at_adapter* adapter)
> 	    
>             skb_reserve(skb, NET_IP_ALIGN);
>             skb->dev = netdev;
>-	    	eth_copy_and_sum(
>-	        	skb, 
>-				rxd->packet,
>-				rx_size, 0);
>+            memcpy (skb->data, rxd->packet, rx_size);
> 	    	skb_put(skb, rx_size);
> 	    /*
>             memcpy(skb_put(skb, rx_size),

Actions: View | Diff

Attachments on bug 249382: 200671 | 200681 | 200701 | 257021 | 257031 | 287941 | 290365