FW: [Patch 2.6.24 1/3]S2io: Support for vlan_rx_kill_vid entry point

The patches failed because they were applied on the 2.6.25 branch, while
they were meant for the 2.6.24 branch (upstream-linus).

Ram

-----Original Message-----
From: Ramkrishna Vepa
Sent: Friday, February 01, 2008 11:01 AM
To: 'Jeff Garzik'; Sreenivasa Honnur
Cc: support
Subject: RE: [Patch 2.6.24 1/3]S2io: Support for vlan_rx_kill_vid

entry

point

quoted

Sreenivasa Honnur wrote:

quoted

- Added s2io_vlan_rx_kill_vid entry point function for

unregistering

quoted

vlan.

quoted

- Fix to aggregate vlan packets. IP offset is incremented by
  4 bytes if the packet contains vlan header.

Signed-off-by: Surjit Reang <redacted>
Signed-off-by: Ramkrishna Vepa <redacted>

applied 1-2, patch #3 failed to apply

[Ram] This sequence of patches were meant for 2.6.24 (upstream-linus)

and

patch #3 was only a version update -
-#define DRV_VERSION "2.0.26.17"
+#define DRV_VERSION "2.0.26.18"
I just checked upstream-linus and the version is still 2.0.26.17. Any

idea

why the patch failed?

Thanks,
Ram