Michael Ellerman <[EMAIL PROTECTED]> wrote on 06/07/2007 02:35:00 AM:
> On Wed, 2007-06-06 at 20:53 +0200, Thomas Klein wrote: > > This patch fixes a possible kernel panic due to not checking the vlan group > > when processing received VLAN packets and a malfunction in VLAN/hypervisor > > registration. > > > > > > Signed-off-by: Thomas Klein <[EMAIL PROTECTED]> > > --- > > > > > > diff -Nurp -X dontdiff linux-2.6.22-rc4/drivers/net/ehea/ehea.h > patched_kernel/drivers/net/ehea/ehea.h > > --- linux-2.6.22-rc4/drivers/net/ehea/ehea.h 2007-06-05 02:57: > 25.000000000 +0200 > > +++ patched_kernel/drivers/net/ehea/ehea.h 2007-06-06 12:53:58. > 000000000 +0200 > > @@ -39,7 +39,7 @@ > > #include <asm/io.h> > > > > #define DRV_NAME "ehea" > > -#define DRV_VERSION "EHEA_0061" > > +#define DRV_VERSION "EHEA_0064" > > > > #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ > > | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) > > diff -Nurp -X dontdiff linux-2.6.22- > rc4/drivers/net/ehea/ehea_main.c patched_kernel/drivers/net/ehea/ehea_main.c > > --- linux-2.6.22-rc4/drivers/net/ehea/ehea_main.c 2007-06-05 02: > 57:25.000000000 +0200 > > +++ patched_kernel/drivers/net/ehea/ehea_main.c 2007-06-06 12: > 53:58.000000000 +0200 > > @@ -1947,7 +1945,7 @@ static void ehea_vlan_rx_add_vid(struct > > } > > > > index = (vid / 64); > > - cb1->vlan_filter[index] |= ((u64)(1 << (vid & 0x3F))); > > + cb1->vlan_filter[index] |= ((u64)(0x8000000000000000 >> (vid & 0x3F))); > > > > hret = ehea_h_modify_ehea_port(adapter->handle, port->logical_port_id, > > H_PORT_CB1, H_PORT_CB1_ALL, cb1); > > @@ -1982,7 +1980,7 @@ static void ehea_vlan_rx_kill_vid(struct > > } > > > > index = (vid / 64); > > - cb1->vlan_filter[index] &= ~((u64)(1 << (vid & 0x3F))); > > + cb1->vlan_filter[index] &= ~((u64)(0x8000000000000000 >> (vid & 0x3F))); > > These two seem ripe for splitting into some sort of helper routine. > Which would leave only one place to get it right. > Basically agreed. But as we're already at rc4 I wanted to keep the patch as least invasive as possible. The modification you suggest can be implemented as a code improvement in 2.6.23. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
